From c47a83eef15a23a2e777c09fffcdf043b3a7e133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Mon, 26 Oct 2020 23:06:15 +0100
Subject: [PATCH] use latest po4a to correctly manage block continuations
Block continuations with indentation were not processed correctly.
---
po/documentation.de.po | 681 ++--
po/documentation.es.po | 622 +---
po/documentation.es_MX.po | 627 +---
po/documentation.fr.po | 1991 +++--------
po/documentation.hu.po | 590 +--
po/documentation.id.po | 588 +--
po/documentation.is.po | 6132 +++++++++++++++++---------------
po/documentation.it.po | 591 +--
po/documentation.ja.po | 5217 +++++++++++++--------------
po/documentation.ko.po | 588 +--
po/documentation.mr.po | 588 +--
po/documentation.nb_NO.po | 626 +---
po/documentation.nl.po | 635 +---
po/documentation.pl.po | 589 +--
po/documentation.pot | 1544 +++++---
po/documentation.pt_BR.po | 1768 ++++-----
po/documentation.pt_PT.po | 591 +--
po/documentation.ru.po | 630 +---
po/documentation.tr.po | 611 +---
po/documentation.zh_HANS-CN.po | 611 +---
po/documentation.zh_HANT.po | 652 +---
21 files changed, 10471 insertions(+), 16001 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 35c95f2..2b2370a 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-08-18 02:32+0000\n"
"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
"Language-Team: Matthias Aßhauer <mha1993@live.de>\n"
@@ -2478,18 +2478,13 @@ msgstr "Wenn eine Variable einen Wahrheitswert annehmen soll, werden viele Synon
msgid "true"
msgstr "true"
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr "Boolesche Werte für „true“ können alternativ auch `yes`, `on`, `true`"
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "and `1`. Also, a variable defined without `= <value>`\n"
+#| "is taken as true.\n"
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
"und `1` sein. Auch eine Variable, die ohne `= <Wert>`\n"
"definiert ist, wird als wahr angenommen.\n"
@@ -2500,17 +2495,12 @@ msgstr ""
msgid "false"
msgstr "false"
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr "Boolesche Werte für „false“ können alternativ auch `no`, `off`, `false`,"
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
-msgstr "`0` und eine leere Zeichenkette sein.\n"
+#, fuzzy, priority:100
+#| msgid "Boolean false literals are `no`, `off`, `false`,"
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
+msgstr "Boolesche Werte für „false“ können alternativ auch `no`, `off`, `false`,"
#. type: Plain text
#: en/config.txt:254
@@ -9957,7 +9947,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17362,17 +17352,12 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
+msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
#. type: Labeled list
#: en/git-cvsimport.txt:71
@@ -20975,16 +20960,10 @@ msgstr "--exclude-from=<Datei>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--recurse-submodules[=<Pfadspezifikation]"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22813,17 +22792,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22839,18 +22813,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -26218,7 +26186,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -40204,283 +40172,163 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "Git Commits"
+msgid "Empty commits"
+msgstr "Git-Commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "`context`"
+msgid "Context"
+msgstr "`context`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
-#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:775
+#, fuzzy, no-wrap, priority:100
+#| msgid "Configuration"
+msgid "Commit Rewording"
+msgstr "Configuration"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49802,16 +49650,10 @@ msgstr ""
msgid "checkout"
msgstr "--no-checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49826,28 +49668,16 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49862,20 +49692,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -54172,17 +53992,12 @@ msgstr "wobei:"
msgid "<old|new>-file"
msgstr "<alte|neue>-Datei"
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr "Dateien sind, die GIT_EXTERNAL_DIFF benutzen kann um"
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
-msgstr "den <alten|neuen> Inhalt auszulesen,\n"
+#, fuzzy, priority:100
+#| msgid "are files GIT_EXTERNAL_DIFF can use to read the"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr "Dateien sind, die GIT_EXTERNAL_DIFF benutzen kann um"
#. type: Labeled list
#: en/git.txt:565
@@ -55024,16 +54839,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -55132,16 +54941,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -55156,22 +54959,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -60122,16 +59913,10 @@ msgstr "Farbe zurücksetzen"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -60152,17 +59937,12 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-#, priority:260
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy, priority:260
+#| msgid "ref names, like the --decorate option of linkgit:git-log[1]"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "Ref-Namen, wie die Option --decorate in linkgit:git-log[1]"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -60170,16 +59950,10 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -60188,16 +59962,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -60206,16 +59974,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -60224,16 +59986,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -60242,16 +59998,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -60351,16 +60101,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "oder linkgit:git-blame[1])"
+#: en/pretty-formats.txt:180
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -60381,10 +60126,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -60405,15 +60151,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
@@ -60519,10 +60260,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -60543,10 +60285,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -60567,10 +60310,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60680,17 +60424,12 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "Ref-Name, der in der Befehlszeile angegeben wurde, mit dem der Commit zustande gekommen ist"
-
#. type: Plain text
#: en/pretty-formats.txt:213
-#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
-msgstr ""
+#, fuzzy, priority:260
+#| msgid "'%S': ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "Zeigt den Referenznamen für jeden dargestellt Commits."
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -60776,16 +60515,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60830,17 +60563,12 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr "zeige den Fingerabdruck des primären Schlüssels, dessen Unterschlüssel zum"
-
#. type: Plain text
#: en/pretty-formats.txt:235
-#, priority:260
-msgid "to sign a signed commit"
-msgstr "Signieren eines Commits verwendet wurde"
+#, fuzzy, priority:260
+#| msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgstr "zeige den Fingerabdruck des primären Schlüssels, dessen Unterschlüssel zum"
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -60860,16 +60588,10 @@ msgstr "zeigt den Grad der Vertraulichkeit für den Schlüssel an, der zum Unter
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60878,16 +60600,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60909,10 +60625,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60933,10 +60650,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] oder linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60956,16 +60674,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -66275,6 +65987,28 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#~ msgid "Boolean true literals are `yes`, `on`, `true`,"
+#~ msgstr "Boolesche Werte für „true“ können alternativ auch `yes`, `on`, `true`"
+
+#~ msgid "`0` and the empty string.\n"
+#~ msgstr "`0` und eine leere Zeichenkette sein.\n"
+
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "den <alten|neuen> Inhalt auszulesen,\n"
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "oder linkgit:git-blame[1])"
+
+#~ msgid "ref name given on the command line by which the commit was reached"
+#~ msgstr "Ref-Name, der in der Befehlszeile angegeben wurde, mit dem der Commit zustande gekommen ist"
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "Signieren eines Commits verwendet wurde"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
@@ -66338,9 +66072,6 @@ msgstr ""
#~ msgid "git-remote-testgit(1)"
#~ msgstr "git-remote-testgit(1)"
-#~ msgid "'%S': ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
-#~ msgstr "Zeigt den Referenznamen für jeden dargestellt Commits."
-
#~ msgid "You are reading the documentation for the latest (possibly unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here:"
#~ msgstr "Sie lesen die Dokumentation der neusten (ggf. noch nicht veröffentlichten) Git-Version, die im 'master'-Branch des `git.git`-Repositories verfügbar ist. Die Dokumentation älterer Versionen finden Sie hier:"
@@ -66567,10 +66298,6 @@ msgstr ""
#~ msgid "color.grep"
#~ msgstr "color.grep"
-#, ignore-same
-#~ msgid "`context`"
-#~ msgstr "`context`"
-
#, ignore-same
#~ msgid "`filename`"
#~ msgstr "`filename`"
diff --git a/po/documentation.es.po b/po/documentation.es.po
index c91fb40..ee2b7a0 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-24 17:26+0000\n"
"Last-Translator: Vibo Lavida <vibo@firemail.cc>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -778,8 +778,7 @@ msgstr "linkgit:git-bisect[1]"
#: en/cmds-mainporcelain.txt:12
#, priority:100
msgid "Use binary search to find the commit that introduced a bug."
-msgstr ""
-"Usar la búsqueda binaria para encontrar la confirmación que introdujo el bug."
+msgstr "Usar la búsqueda binaria para encontrar la confirmación que introdujo el bug."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
@@ -887,9 +886,7 @@ msgstr "linkgit:git-describe[1]"
#: en/cmds-mainporcelain.txt:39
#, priority:100
msgid "Give an object a human readable name based on an available ref."
-msgstr ""
-"Dar a un objeto un nombre legible por personas basado en una referencia "
-"disponible."
+msgstr "Dar a un objeto un nombre legible por personas basado en una referencia disponible."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
@@ -901,9 +898,7 @@ msgstr "linkgit:git-diff[1]"
#: en/cmds-mainporcelain.txt:42
#, priority:100
msgid "Show changes between commits, commit and working tree, etc."
-msgstr ""
-"Muestra las diferencias entre dis confirmaciones, entre una confirmación y "
-"el árbol de trabajo, etc."
+msgstr "Muestra las diferencias entre dis confirmaciones, entre una confirmación y el árbol de trabajo, etc."
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
@@ -1023,8 +1018,7 @@ msgstr "linkgit:git-mv[1]"
#: en/cmds-mainporcelain.txt:72
#, priority:100
msgid "Move or rename a file, a directory, or a symlink."
-msgstr ""
-"Mueve o cambia el nombre a un fichero, un directorio o un enlace simbólico."
+msgstr "Mueve o cambia el nombre a un fichero, un directorio o un enlace simbólico."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:73
@@ -1072,8 +1066,7 @@ msgstr "linkgit:git-range-diff[1]"
#: en/cmds-mainporcelain.txt:84
#, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
-msgstr ""
-"Compara dos rangos de confirmaciones (por ejemplo: dos versions de una rama)."
+msgstr "Compara dos rangos de confirmaciones (por ejemplo: dos versions de una rama)."
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1172
@@ -1181,8 +1174,7 @@ msgstr "linkgit:git-stash[1]"
#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Stash the changes in a dirty working directory away."
-msgstr ""
-"Poner en una reserva los cambios de un directorio de trabajo con cambios."
+msgstr "Poner en una reserva los cambios de un directorio de trabajo con cambios."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
@@ -1266,9 +1258,7 @@ msgstr "linkgit:git-cat-file[1]"
#: en/cmds-plumbinginterrogators.txt:3
#, priority:100
msgid "Provide content or type and size information for repository objects."
-msgstr ""
-"Proporciona contenido o tipo y tamaño de información para objetos del "
-"repositorio."
+msgstr "Proporciona contenido o tipo y tamaño de información para objetos del repositorio."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
@@ -2447,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2467,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9853,7 +9829,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17088,16 +17064,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -19825,9 +19795,7 @@ msgstr ""
#: en/git-diff.txt:66
#, 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>...]"
+msgstr "'git diff' [<opciones>] <confirmación> <confirmación>... <confirmación> [--] [<ruta>...]"
#. type: Plain text
#: en/git-diff.txt:74
@@ -20063,9 +20031,7 @@ msgstr ""
#: en/git-diff.txt:213
#, 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]"
+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]"
#. type: Title =
#: en/git-fast-export.txt:2
@@ -20654,16 +20620,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22487,17 +22447,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22513,18 +22468,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25857,7 +25806,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39751,283 +39700,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49286,16 +49113,10 @@ msgstr ""
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49310,28 +49131,16 @@ msgstr ""
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49346,20 +49155,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53600,16 +53399,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54440,16 +54233,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54548,16 +54335,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54572,22 +54353,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59514,16 +59283,10 @@ msgstr "restablece el color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59545,33 +59308,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59580,16 +59331,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59598,16 +59343,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59616,16 +59355,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59634,16 +59367,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59743,17 +59470,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "o linkgit:git-blame[1])"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -59773,9 +59494,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59797,15 +59518,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59911,9 +59626,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59935,9 +59650,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59959,9 +59674,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60072,16 +59787,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60168,16 +59877,10 @@ msgstr ""
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60222,16 +59925,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60252,16 +59949,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60270,16 +59961,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60301,9 +59986,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60325,9 +60010,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60348,16 +60033,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65649,6 +65328,13 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "o linkgit:git-blame[1])"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 8b00415..2a7f133 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,13 +5,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2019-10-05 21:56+0000\n"
"Last-Translator: Farándula <farandula@versoblanco.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es_MX\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\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 3.9-dev\n"
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9838,7 +9824,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17065,16 +17051,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20628,16 +20608,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22461,17 +22435,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22487,18 +22456,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25835,7 +25798,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39724,283 +39687,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49261,16 +49102,10 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49285,28 +49120,16 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49321,20 +49144,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53578,16 +53391,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54418,16 +54225,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54526,16 +54327,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54550,22 +54345,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59504,16 +59287,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59535,33 +59312,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59570,16 +59335,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59588,16 +59347,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59606,16 +59359,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59624,16 +59371,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59736,17 +59477,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy, priority:260
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59768,10 +59503,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59792,16 +59528,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -59909,10 +59639,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -59934,10 +59665,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -59958,10 +59690,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60072,16 +59805,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60170,16 +59897,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60224,16 +59945,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60254,16 +59969,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60272,16 +59981,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60303,10 +60006,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60327,10 +60031,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60350,16 +60055,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65653,6 +65352,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 700ed0b..e9afc6a 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-16 19:26+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-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.3.1-dev\n"
@@ -39,9 +39,7 @@ msgstr "--root"
#: en/blame-options.txt:8
#, priority:100
msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
-msgstr ""
-"Ne pas considérer les commits de base comme des limites. Ceci peut "
-"également être contrôlé via l'option de configuration `blame.showRoot`."
+msgstr "Ne pas considérer les commits de base comme des limites. Ceci peut également être contrôlé via l'option de configuration `blame.showRoot`."
#. type: Labeled list
#: en/blame-options.txt:9
@@ -53,8 +51,7 @@ msgstr "--show-stats"
#: en/blame-options.txt:11
#, priority:100
msgid "Include additional statistics at the end of blame output."
-msgstr ""
-"Inclure des statistiques supplémentaires à la fin de la sortie de blame."
+msgstr "Inclure des statistiques supplémentaires à la fin de la sortie de blame."
#. type: Labeled list
#: en/blame-options.txt:12
@@ -72,17 +69,13 @@ msgstr "-L: <nomfonc>"
#: en/blame-options.txt:16
#, priority:100
msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
-msgstr ""
-"N'annoter que la plage de lignes donnée. Peut être spécifié plusieurs fois. "
-"Les intervalles qui se chevauchent sont autorisés."
+msgstr "N'annoter que la plage de lignes donnée. Peut être spécifié plusieurs fois. Les intervalles qui se chevauchent sont autorisés."
#. type: Plain text
#: en/blame-options.txt:19
#, priority:100
msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
-msgstr ""
-"<début>et <fin> sont facultatifs. ''-L <début>'' ou ''-L <end>'', s’étend de "
-"<début>à la fin du fichier. ''-L,<fin>'' s’étend du début du fichier à <fin>."
+msgstr "<début>et <fin> sont facultatifs. ''-L <début>'' ou ''-L <end>'', s’étend de <début>à la fin du fichier. ''-L,<fin>'' s’étend du début du fichier à <fin>."
#. type: Labeled list
#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:45 en/git-config.txt:164 en/git-grep.txt:187 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
@@ -130,13 +123,7 @@ msgstr "--reverse <rév>..<rév>"
#: en/blame-options.txt:38
#, priority:100
msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience."
-msgstr ""
-"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`."
+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:39 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
@@ -148,11 +135,7 @@ msgstr "--first-parent"
#: en/blame-options.txt:44
#, priority:100
msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall."
-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."
+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:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
@@ -182,10 +165,7 @@ msgstr "--line-porcelain"
#: en/blame-options.txt:53
#, priority:100
msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
-msgstr ""
-"Afficher le format porcelaine, mais sortir les informations de commit pour "
-"chaque ligne, et pas seulement la première fois qu'un commit est référencé. "
-"Implique --porcelaine."
+msgstr "Afficher le format porcelaine, mais sortir les informations de commit pour chaque ligne, et pas seulement la première fois qu'un commit est référencé. Implique --porcelaine."
#. type: Labeled list
#: en/blame-options.txt:54 en/git-pack-objects.txt:138 en/git-svn.txt:373
@@ -197,9 +177,7 @@ msgstr "--incremental"
#: en/blame-options.txt:57
#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
-msgstr ""
-"Afficher le résultat progressivement dans un format conçu pour la "
-"consommation par une machine."
+msgstr "Afficher le résultat progressivement dans un format conçu pour la consommation par une machine."
#. type: Labeled list
#: en/blame-options.txt:58 en/git-mailinfo.txt:62 en/pretty-options.txt:35
@@ -211,11 +189,7 @@ msgstr "--encoding=<codage>"
#: en/blame-options.txt:64
#, priority:100
msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
-msgstr ""
-"Spécifier l’encodage utilisé pour produire les des noms d’auteurs et les "
-"résumés des commits. Le définir sur `none` rend la sortie de blâme des "
-"données non converties. Pour plus d’informations, voir la discussion sur l’"
-"encodage dans la page manuelle linkgit:git-log[1]."
+msgstr "Spécifier l’encodage utilisé pour produire les des noms d’auteurs et les résumés des commits. Le définir sur `none` rend la sortie de blâme des données non converties. Pour plus d’informations, voir la discussion sur l’encodage dans la page manuelle linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:65
@@ -227,12 +201,7 @@ msgstr "--contents <fichier>"
#: en/blame-options.txt:71
#, priority:100
msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
-msgstr ""
-"Lorsque <rév> n'est pas spécifié, la commande annote les modifications en "
-"arrière à partir de la copie de l'arbre de travail. Ce drapeau permet à la "
-"commande de faire croire que la copie de l'arbre de travail contient le "
-"contenu du fichier nommé (spécifier `-` pour que la commande lise à partir "
-"de l'entrée standard)."
+msgstr "Lorsque <rév> n'est pas spécifié, la commande annote les modifications en arrière à partir de la copie de l'arbre de travail. Ce drapeau permet à la commande de faire croire que la copie de l'arbre de travail contient le contenu du fichier nommé (spécifier `-` pour que la commande lise à partir de l'entrée standard)."
#. type: Labeled list
#: en/blame-options.txt:72
@@ -244,12 +213,7 @@ msgstr "--date <format>"
#: en/blame-options.txt:78
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
-msgstr ""
-"Spécifie le format utilisé pour les dates sur la sortie. Si --date n’est pas "
-"fourni, la valeur de la variable de configuration blame.date est utilisée. "
-"Si la variable de configuration blame.date n’est pas non plus définie, le "
-"format iso est utilisé. Pour les valeurs prises en charge, voir la "
-"discussion de l’option --date à linkgit:git-log[1]."
+msgstr "Spécifie le format utilisé pour les dates sur la sortie. Si --date n’est pas fourni, la valeur de la variable de configuration blame.date est utilisée. Si la variable de configuration blame.date n’est pas non plus définie, le format iso est utilisé. Pour les valeurs prises en charge, voir la discussion de l’option --date à linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:79 en/git-fsck.txt:100
@@ -261,11 +225,7 @@ msgstr "--[no-]progress"
#: en/blame-options.txt:85
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
-msgstr ""
-"L'état d'avancement est indiqué par défaut sur le flux d'erreurs standard "
-"lorsqu'il est connecté à un terminal. Ce drapeau permet de signaler l'état "
-"d'avancement même s'il n'est pas attaché à un terminal. On ne peut pas "
-"utiliser `--progress` avec `--porcelain` ou `--incremental`."
+msgstr "L'état d'avancement est indiqué par défaut sur le flux d'erreurs standard lorsqu'il est connecté à un terminal. Ce drapeau permet de signaler l'état d'avancement même s'il n'est pas attaché à un terminal. On ne peut pas utiliser `--progress` avec `--porcelain` ou `--incremental`."
#. type: Labeled list
#: en/blame-options.txt:86
@@ -277,25 +237,13 @@ msgstr "-M[<num>]"
#: en/blame-options.txt:96
#, priority:100
msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
-msgstr ""
-"Détecter les lignes déplacées ou copiées dans un fichier. Lorsqu'un commit "
-"déplace ou copie un bloc de lignes (par exemple, le fichier original a A "
-"puis B, et le commit le change en B puis A), l'algorithme traditionnel de "
-"'blame' ne remarque que la moitié du mouvement et blâme généralement les "
-"lignes qui ont été déplacées vers le haut (c'est-à-dire B) au parent et "
-"attribue le blâme aux lignes qui ont été déplacées vers le bas (c'est-à-dire "
-"A) au commit enfant. Avec cette option, les deux groupes de lignes sont "
-"blâmés sur le parent en effectuant des passes d'inspection supplémentaires."
+msgstr "Détecter les lignes déplacées ou copiées dans un fichier. Lorsqu'un commit déplace ou copie un bloc de lignes (par exemple, le fichier original a A puis B, et le commit le change en B puis A), l'algorithme traditionnel de 'blame' ne remarque que la moitié du mouvement et blâme généralement les lignes qui ont été déplacées vers le haut (c'est-à-dire B) au parent et attribue le blâme aux lignes qui ont été déplacées vers le bas (c'est-à-dire A) au commit enfant. Avec cette option, les deux groupes de lignes sont blâmés sur le parent en effectuant des passes d'inspection supplémentaires."
#. type: Plain text
#: en/blame-options.txt:101
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
-msgstr ""
-"<num>est facultatif, mais c’est la limite inférieure sur le nombre de "
-"caractères alphanumériques que Git doit détecter comme déplacées/copiées "
-"dans un fichier pour qu’il associe ces lignes avec le commit parent. La "
-"valeur par défaut est 20."
+msgstr "<num>est facultatif, mais c’est la limite inférieure sur le nombre de caractères alphanumériques que Git doit détecter comme déplacées/copiées dans un fichier pour qu’il associe ces lignes avec le commit parent. La valeur par défaut est 20."
#. type: Labeled list
#: en/blame-options.txt:102
@@ -307,25 +255,13 @@ msgstr "-C[<num>]"
#: en/blame-options.txt:111
#, priority:100
msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
-msgstr ""
-"En plus de `-M`, détecter les lignes déplacées ou copiées à partir d'autres "
-"fichiers qui ont été modifiés dans le même commit. Ceci est utile lorsque "
-"vous réorganisez votre programme et que vous déplacez du code d'un fichier à "
-"l'autre. Lorsque cette option est donnée deux fois, la commande recherche "
-"en plus les copies depuis d'autres fichiers dans le commit qui crée le "
-"fichier. Lorsque cette option est donnée trois fois, la commande recherche "
-"également des copies d'autres fichiers dans n'importe quel commit."
+msgstr "En plus de `-M`, détecter les lignes déplacées ou copiées à partir d'autres fichiers qui ont été modifiés dans le même commit. Ceci est utile lorsque vous réorganisez votre programme et que vous déplacez du code d'un fichier à l'autre. Lorsque cette option est donnée deux fois, la commande recherche en plus les copies depuis d'autres fichiers dans le commit qui crée le fichier. Lorsque cette option est donnée trois fois, la commande recherche également des copies d'autres fichiers dans n'importe quel commit."
#. type: Plain text
#: en/blame-options.txt:118
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
-msgstr ""
-"<num> est optionnel mais c'est la limite inférieure du nombre de caractères "
-"alphanumériques que Git doit détecter comme étant des déplacements/copies "
-"entre fichiers pour qu'il puisse associer ces lignes au commit parent. Et la "
-"valeur par défaut est 40. S'il y a plus d'une option `-C` donnée, l'argument "
-"<num> du dernier `-C` prendra effet."
+msgstr "<num> est optionnel mais c'est la limite inférieure du nombre de caractères alphanumériques que Git doit détecter comme étant des déplacements/copies entre fichiers pour qu'il puisse associer ces lignes au commit parent. Et la valeur par défaut est 40. S'il y a plus d'une option `-C` donnée, l'argument <num> du dernier `-C` prendra effet."
#. type: Labeled list
#: en/blame-options.txt:119
@@ -337,18 +273,7 @@ msgstr "--ignore-rev <rév>"
#: en/blame-options.txt:130
#, priority:100
msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
-msgstr ""
-"Ignorer les modifications apportées par la révision lors de l'attribution de "
-"la responsabilité, comme si la modification ne s'était jamais produite. Les "
-"lignes qui ont été modifiées ou ajoutées par un commit ignoré seront blâmées "
-"sur le commit précédent qui a modifié cette ligne ou les lignes voisines. "
-"Cette option peut être spécifiée plusieurs fois pour ignorer plus d'une "
-"révision. Si l'option de configuration `blame.markIgnoredLines` est "
-"activée, alors les lignes qui ont été modifiées par un commit ignoré et "
-"attribuées à un autre commit seront marquées avec un `?` dans la sortie de "
-"blame. Si l'option de configuration `blame.markUnblamableLines` est "
-"définie, alors les lignes touchées par un commit ignoré que nous n'avons pas "
-"pu attribuer à une autre révision sont marquées d'un '*'."
+msgstr "Ignorer les modifications apportées par la révision lors de l'attribution de la responsabilité, comme si la modification ne s'était jamais produite. Les lignes qui ont été modifiées ou ajoutées par un commit ignoré seront blâmées sur le commit précédent qui a modifié cette ligne ou les lignes voisines. Cette option peut être spécifiée plusieurs fois pour ignorer plus d'une révision. Si l'option de configuration `blame.markIgnoredLines` est activée, alors les lignes qui ont été modifiées par un commit ignoré et attribuées à un autre commit seront marquées avec un `?` dans la sortie de blame. Si l'option de configuration `blame.markUnblamableLines` est définie, alors les lignes touchées par un commit ignoré que nous n'avons pas pu attribuer à une autre révision sont marquées d'un '*'."
#. type: Labeled list
#: en/blame-options.txt:131
@@ -360,12 +285,7 @@ msgstr "--ignore-revs-file <fichier>"
#: en/blame-options.txt:137
#, priority:100
msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
-msgstr ""
-"Ignorer les révisions listées dans le `fichier`, qui doit être au même "
-"format qu'un `fsck.skipList`. Cette option peut être répétée, et ces "
-"fichiers seront traités après tous les fichiers spécifiés avec l'option de "
-"configuration `blame.ignoreRevsFile`. Un nom de fichier vide, `\"\"`, "
-"effacera la liste des révisions des fichiers précédemment traités."
+msgstr "Ignorer les révisions listées dans le `fichier`, qui doit être au même format qu'un `fsck.skipList`. Cette option peut être répétée, et ces fichiers seront traités après tous les fichiers spécifiés avec l'option de configuration `blame.ignoreRevsFile`. Un nom de fichier vide, `\"\"`, effacera la liste des révisions des fichiers précédemment traités."
#. type: Labeled list
#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
@@ -413,8 +333,7 @@ msgstr "linkgit:git-bugreport[1]"
#: en/cmds-ancillaryinterrogators.txt:9
#, priority:100
msgid "Collect information for user to file a bug report."
-msgstr ""
-"Collecter des informations pour que l’utilisateur dépose un rapport de bogue."
+msgstr "Collecter des informations pour que l’utilisateur dépose un rapport de bogue."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
@@ -2154,29 +2073,13 @@ msgstr "FICHIER DE CONFIGURATION"
#: en/config.txt:12
#, priority:100
msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see the \"CONFIGURATION FILE\" section of linkgit:git-worktree[1]) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration."
-msgstr ""
-"Le fichier de configuration Git contient un certain nombre de variables qui "
-"affectent le comportement des commandes Git. Les fichiers `.git/config` et "
-"éventuellement `config.worktree` (voir la section \"FICHIER DE "
-"CONFIGURATION\" de linkgit:git-worktree[1]) dans chaque dépôt sont utilisés "
-"pour stocker la configuration de ce dépôt, et `$HOME/.gitconfig` est utilisé "
-"pour stocker une configuration par utilisateur comme valeurs de repli pour "
-"le fichier `.git/config`. Le fichier `/etc/gitconfig` peut être utilisé pour "
-"stocker une configuration par défaut pour l'ensemble du système."
+msgstr "Le fichier de configuration Git contient un certain nombre de variables qui affectent le comportement des commandes Git. Les fichiers `.git/config` et éventuellement `config.worktree` (voir la section \"FICHIER DE CONFIGURATION\" de linkgit:git-worktree[1]) dans chaque dépôt sont utilisés pour stocker la configuration de ce dépôt, et `$HOME/.gitconfig` est utilisé pour stocker une configuration par utilisateur comme valeurs de repli pour le fichier `.git/config`. Le fichier `/etc/gitconfig` peut être utilisé pour stocker une configuration par défaut pour l'ensemble du système."
#. type: Plain text
#: en/config.txt:21
#, priority:100
msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued."
-msgstr ""
-"Les variables de configuration sont utilisées à la fois par la plomberie Git "
-"et les porcelaines. Les variables sont divisées en sections, dans lesquelles "
-"le nom de variable entièrement qualifié de la variable elle-même est le "
-"dernier segment séparé par un point et le nom de la section est tout ce qui "
-"précède le dernier point. Les noms de variables sont insensibles à la casse, "
-"n'autorisent que les caractères alphanumériques et `-`, et doivent commencer "
-"par un caractère alphabétique. Certaines variables peuvent apparaître "
-"plusieurs fois ; on dit alors que la variable est multivaluée."
+msgstr "Les variables de configuration sont utilisées à la fois par la plomberie Git et les porcelaines. Les variables sont divisées en sections, dans lesquelles le nom de variable entièrement qualifié de la variable elle-même est le dernier segment séparé par un point et le nom de la section est tout ce qui précède le dernier point. Les noms de variables sont insensibles à la casse, n'autorisent que les caractères alphanumériques et `-`, et doivent commencer par un caractère alphabétique. Certaines variables peuvent apparaître plusieurs fois ; on dit alors que la variable est multivaluée."
#. type: Title ~
#: en/config.txt:23
@@ -2188,32 +2091,19 @@ msgstr "Syntaxe"
#: en/config.txt:28
#, priority:100
msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
-msgstr ""
-"La syntaxe est assez souple et permissive ; les espaces blancs sont "
-"généralement ignorés. Les caractères '#' et ' ;' commencent les "
-"commentaires à la fin de la ligne, les lignes blanches sont ignorées."
+msgstr "La syntaxe est assez souple et permissive ; les espaces blancs sont généralement ignorés. Les caractères '#' et ' ;' commencent les commentaires à la fin de la ligne, les lignes blanches sont ignorées."
#. type: Plain text
#: en/config.txt:35
#, priority:100
msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable."
-msgstr ""
-"Le fichier se compose de sections et de variables. Une section commence par "
-"le nom de la section entre crochets et se poursuit jusqu'au début de la "
-"section suivante. Les noms de section ne sont pas sensibles à la casse. "
-"Seuls les caractères alphanumériques, `-` et `.` sont autorisés dans les "
-"noms de section. Chaque variable doit appartenir à une section, ce qui "
-"signifie qu'il doit y avoir un en-tête de section avant le premier "
-"paramétrage d'une variable."
+msgstr "Le fichier se compose de sections et de variables. Une section commence par le nom de la section entre crochets et se poursuit jusqu'au début de la section suivante. Les noms de section ne sont pas sensibles à la casse. Seuls les caractères alphanumériques, `-` et `.` sont autorisés dans les noms de section. Chaque variable doit appartenir à une section, ce qui signifie qu'il doit y avoir un en-tête de section avant le premier paramétrage d'une variable."
#. type: Plain text
#: en/config.txt:39
#, priority:100
msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:"
-msgstr ""
-"Les sections peuvent être divisées en sous-sections. Pour commencer une sous-"
-"section, mettez son nom entre guillemets, séparé du nom de la section par "
-"un espace, dans l'en-tête de la section, comme dans l'exemple ci-dessous :"
+msgstr "Les sections peuvent être divisées en sous-sections. Pour commencer une sous-section, mettez son nom entre guillemets, séparé du nom de la section par un espace, dans l'en-tête de la section, comme dans l'exemple ci-dessous :"
#. type: delimited block -
#: en/config.txt:42
@@ -2225,72 +2115,37 @@ msgstr "\t[section \"sous-section\"]\n"
#: en/config.txt:53
#, priority:100
msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to."
-msgstr ""
-"Les noms de sous-sections sont sensibles à la casse et peuvent contenir "
-"n'importe quel caractère, à l'exception du saut de ligne et de l'octet nul. "
-"Les guillemets `\"` et les barres obliques inverses peuvent être inclus en "
-"les échappant sous la forme `\\\"` et `\\\\`, respectivement. Les barres "
-"obliques inverses précédant d'autres caractères sont supprimées lors de la "
-"lecture ; par exemple, `\\t` est lu comme `t` et `\\0` est lu comme `0` Les "
-"en-têtes de section ne peuvent pas s'étendre sur plusieurs lignes. Les "
-"variables peuvent appartenir directement à une section ou à une sous-section "
-"donnée. Vous pouvez avoir une `[section]` si vous avez `[section sous-"
-"section]`, mais vous n'en avez pas besoin."
+msgstr "Les noms de sous-sections sont sensibles à la casse et peuvent contenir n'importe quel caractère, à l'exception du saut de ligne et de l'octet nul. Les guillemets `\"` et les barres obliques inverses peuvent être inclus en les échappant sous la forme `\\\"` et `\\\\`, respectivement. Les barres obliques inverses précédant d'autres caractères sont supprimées lors de la lecture ; par exemple, `\\t` est lu comme `t` et `\\0` est lu comme `0` Les en-têtes de section ne peuvent pas s'étendre sur plusieurs lignes. Les variables peuvent appartenir directement à une section ou à une sous-section donnée. Vous pouvez avoir une `[section]` si vous avez `[section sous-section]`, mais vous n'en avez pas besoin."
#. type: Plain text
#: en/config.txt:58
#, priority:100
msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names."
-msgstr ""
-"Il existe également une syntaxe `[section.sous-section]` obsolète. Avec "
-"cette syntaxe, le nom de la sous-section est converti en minuscules et est "
-"également comparé en tenant compte de la casse. Ces noms de sous-sections "
-"suivent les mêmes restrictions que les noms de sections."
+msgstr "Il existe également une syntaxe `[section.sous-section]` obsolète. Avec cette syntaxe, le nom de la sous-section est converti en minuscules et est également comparé en tenant compte de la casse. Ces noms de sous-sections suivent les mêmes restrictions que les noms de sections."
#. type: Plain text
#: en/config.txt:65
#, priority:100
msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
-msgstr ""
-"Toutes les autres lignes (et le reste de la ligne après l'en-tête de section)"
-" sont reconnues comme des variables de réglage, sous la forme 'nom = valeur' "
-"(ou simplement 'nom', qui est un raccourci pour dire que la variable est le "
-"booléen « vrai »). Les noms des variables sont insensibles à la casse, "
-"n'autorisent que les caractères alphanumériques et `-`, et doivent commencer "
-"par un caractère alphabétique."
+msgstr "Toutes les autres lignes (et le reste de la ligne après l'en-tête de section) sont reconnues comme des variables de réglage, sous la forme 'nom = valeur' (ou simplement 'nom', qui est un raccourci pour dire que la variable est le booléen « vrai »). Les noms des variables sont insensibles à la casse, n'autorisent que les caractères alphanumériques et `-`, et doivent commencer par un caractère alphabétique."
#. type: Plain text
#: en/config.txt:73
#, priority:100
msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
-msgstr ""
-"Une ligne qui définit une valeur peut se poursuivre jusqu'à la ligne "
-"suivante en la terminant par un `\\` ; la barre arrière et la fin de la "
-"ligne sont supprimés. Les espaces après 'nom =', le reste de la ligne après "
-"le premier caractère de commentaire '#' ou ' ;', et les espaces de fin de "
-"ligne sont supprimés, sauf s'ils sont entre guillemets. Les espaces "
-"internes à l'intérieur de la valeur sont conservés textuellement."
+msgstr "Une ligne qui définit une valeur peut se poursuivre jusqu'à la ligne suivante en la terminant par un `\\` ; la barre arrière et la fin de la ligne sont supprimés. Les espaces après 'nom =', le reste de la ligne après le premier caractère de commentaire '#' ou ' ;', et les espaces de fin de ligne sont supprimés, sauf s'ils sont entre guillemets. Les espaces internes à l'intérieur de la valeur sont conservés textuellement."
#. type: Plain text
#: en/config.txt:76
#, priority:100
msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
-msgstr ""
-"À l'intérieur des guillemets, les caractères guillemet `\"` et barre "
-"inversée `\\` doivent être échappés : utilisez `\\\"` pour `\"` et `\\\\` "
-"pour `\\`."
+msgstr "À l'intérieur des guillemets, les caractères guillemet `\"` et barre inversée `\\` doivent être échappés : utilisez `\\\"` pour `\"` et `\\\\` pour `\\`."
#. type: Plain text
#: en/config.txt:81
#, priority:100
msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid."
-msgstr ""
-"Les séquences d'échappement suivantes (en plus de `\\\"` et `\\\\`) sont "
-"reconnues : `\\n"
-"` pour le caractère de retour à la ligne (NL), `\\t` pour la tabulation "
-"horizontale (HT, TAB) et `\\b` pour l'espacement arrière (BS). Les autres "
-"séquences d'échappement de caractères (y compris les séquences d'échappement "
-"octales) ne sont pas valides."
+msgstr "Les séquences d'échappement suivantes (en plus de `\\\"` et `\\\\`) sont reconnues : `\\n` pour le caractère de retour à la ligne (NL), `\\t` pour la tabulation horizontale (HT, TAB) et `\\b` pour l'espacement arrière (BS). Les autres séquences d'échappement de caractères (y compris les séquences d'échappement octales) ne sont pas valides."
#. type: Title ~
#: en/config.txt:84
@@ -2302,34 +2157,19 @@ msgstr "Inclusions"
#: en/config.txt:91
#, priority:100
msgid "The `include` and `includeIf` sections allow you to include config directives from another source. These sections behave identically to each other with the exception that `includeIf` sections may be ignored if their condition does not evaluate to true; see \"Conditional includes\" below."
-msgstr ""
-"Les sections `include` et `includeIf` vous permettent d'inclure des "
-"directives de configuration provenant d'une autre source. Ces sections se "
-"comportent de manière identique, à l'exception des sections `includeIf` qui "
-"peuvent être ignorées si leur condition n'est pas évaluée comme vraie ; voir "
-"\"Inclusions conditionnelles\" ci-dessous."
+msgstr "Les sections `include` et `includeIf` vous permettent d'inclure des directives de configuration provenant d'une autre source. Ces sections se comportent de manière identique, à l'exception des sections `includeIf` qui peuvent être ignorées si leur condition n'est pas évaluée comme vraie ; voir \"Inclusions conditionnelles\" ci-dessous."
#. type: Plain text
#: en/config.txt:96
#, priority:100
msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times."
-msgstr ""
-"Vous pouvez inclure un fichier de configuration à partir d’un autre en "
-"définissant la variable spéciale `include.path` (ou `includeIf.*.path`) au "
-"nom du fichier à inclure. La variable prend un nom de chemin comme valeur, "
-"et est soumise à l’expansion tilde. Ces variables peuvent être données "
-"plusieurs fois."
+msgstr "Vous pouvez inclure un fichier de configuration à partir d’un autre en définissant la variable spéciale `include.path` (ou `includeIf.*.path`) au nom du fichier à inclure. La variable prend un nom de chemin comme valeur, et est soumise à l’expansion tilde. Ces variables peuvent être données plusieurs fois."
#. type: Plain text
#: en/config.txt:102
#, priority:100
msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples."
-msgstr ""
-"Le contenu du fichier inclus est inséré immédiatement, comme s'il avait été "
-"trouvé à l'endroit de la directive d'inclusion. Si la valeur de la variable "
-"est un chemin relatif, le chemin est considéré comme relatif au fichier de "
-"configuration dans lequel la directive include a été trouvée. Voir ci-"
-"dessous pour des exemples."
+msgstr "Le contenu du fichier inclus est inséré immédiatement, comme s'il avait été trouvé à l'endroit de la directive d'inclusion. Si la valeur de la variable est un chemin relatif, le chemin est considéré comme relatif au fichier de configuration dans lequel la directive include a été trouvée. Voir ci-dessous pour des exemples."
#. type: Title ~
#: en/config.txt:104
@@ -2341,19 +2181,13 @@ msgstr "Inclusions conditionnelles"
#: en/config.txt:109
#, priority:100
msgid "You can include a config file from another conditionally by setting a `includeIf.<condition>.path` variable to the name of the file to be included."
-msgstr ""
-"Vous pouvez inclure un fichier de configuration provenant d'un autre fichier "
-"conditionnellement en définissant une variable `includeIf.<condition>.path` "
-"au nom du fichier à inclure."
+msgstr "Vous pouvez inclure un fichier de configuration provenant d'un autre fichier conditionnellement en définissant une variable `includeIf.<condition>.path` au nom du fichier à inclure."
#. type: Plain text
#: en/config.txt:113
#, priority:100
msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:"
-msgstr ""
-"La condition commence par un mot-clé suivi d'un deux-points et de quelques "
-"données dont le format et la signification dépendent du mot-clé. Les mots-"
-"clés pris en charge sont les suivants :"
+msgstr "La condition commence par un mot-clé suivi d'un deux-points et de quelques données dont le format et la signification dépendent du mot-clé. Les mots-clés pris en charge sont les suivants :"
#. type: Labeled list
#: en/config.txt:114
@@ -2365,21 +2199,13 @@ msgstr "`gitdir`"
#: en/config.txt:119
#, priority:100
msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met."
-msgstr ""
-"Les données qui suivent le mot-clé `gitdir:` sont utilisées comme modèle de "
-"motif glob. Si l'emplacement du répertoire .git correspond au motif, la "
-"condition d'inclusion est remplie."
+msgstr "Les données qui suivent le mot-clé `gitdir:` sont utilisées comme modèle de motif glob. Si l'emplacement du répertoire .git correspond au motif, la condition d'inclusion est remplie."
#. type: Plain text
#: en/config.txt:124
#, priority:100
msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
-msgstr ""
-"L'emplacement de .git peut être découvert automatiquement ou provenir de la "
-"variable d'environnement `$GIT_DIR`. Si le dépôt est découvert "
-"automatiquement via un fichier .git (par exemple à partir de sous-modules ou "
-"d'un arbre de travail lié), l'emplacement .git sera l'emplacement final où "
-"se trouve le répertoire .git, et non pas ou le fichier .git"
+msgstr "L'emplacement de .git peut être découvert automatiquement ou provenir de la variable d'environnement `$GIT_DIR`. Si le dépôt est découvert automatiquement via un fichier .git (par exemple à partir de sous-modules ou d'un arbre de travail lié), l'emplacement .git sera l'emplacement final où se trouve le répertoire .git, et non pas ou le fichier .git"
#. type: Block title
#: en/config.txt:124
@@ -2391,45 +2217,31 @@ msgstr "se trouve."
#: en/config.txt:129
#, priority:100
msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:"
-msgstr ""
-"Le motif peut contenir des caractères génériques de globbing standard et "
-"deux autres, `**/` et `/**`, qui peuvent correspondre à plusieurs composants "
-"de chemin d’accès. Veuillez consulter linkgit:gitignore[5] pour plus de "
-"détails. Pour plus de commodité :"
+msgstr "Le motif peut contenir des caractères génériques de globbing standard et deux autres, `**/` et `/**`, qui peuvent correspondre à plusieurs composants de chemin d’accès. Veuillez consulter linkgit:gitignore[5] pour plus de détails. Pour plus de commodité :"
#. type: Plain text
#: en/config.txt:132
#, priority:100
msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`."
-msgstr ""
-"Si le motif commence par `~/`, `~` sera remplacé par le contenu de la "
-"variable d'environnement `HOME`."
+msgstr "Si le motif commence par `~/`, `~` sera remplacé par le contenu de la variable d'environnement `HOME`."
#. type: Plain text
#: en/config.txt:135
#, priority:100
msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file."
-msgstr ""
-"Si le motif commence par '`./`, il est remplacé par le répertoire contenant "
-"le fichier de configuration actuel."
+msgstr "Si le motif commence par '`./`, il est remplacé par le répertoire contenant le fichier de configuration actuel."
#. type: Plain text
#: en/config.txt:139
#, priority:100
msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`."
-msgstr ""
-"Si le motif ne commence pas par `~/`, `./` ou `/`, `**/` sera "
-"automatiquement ajouté en préfixe. Par exemple, le motif `foo/bar` devient "
-"`**/foo/bar` et correspondra à `tout/chemin/vers/foo/bar`."
+msgstr "Si le motif ne commence pas par `~/`, `./` ou `/`, `**/` sera automatiquement ajouté en préfixe. Par exemple, le motif `foo/bar` devient `**/foo/bar` et correspondra à `tout/chemin/vers/foo/bar`."
#. type: Plain text
#: en/config.txt:143
#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively."
-msgstr ""
-"Si le motif se termine par `/`, `**` sera automatiquement ajouté. Par "
-"exemple, le motif `foo/` devient `foo/**`. En d'autres termes, il correspond "
-"à `foo` et à tout ce qui se trouve à l'intérieur, de manière récursive."
+msgstr "Si le motif se termine par `/`, `**` sera automatiquement ajouté. Par exemple, le motif `foo/` devient `foo/**`. En d'autres termes, il correspond à `foo` et à tout ce qui se trouve à l'intérieur, de manière récursive."
#. type: Labeled list
#: en/config.txt:144
@@ -2441,10 +2253,7 @@ msgstr "`gitdir/i`"
#: en/config.txt:147
#, priority:100
msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)"
-msgstr ""
-"C'est la même chose que `gitdir` sauf que la correspondance se fait sans "
-"tenir compte de la casse (par exemple sur les systèmes de fichiers "
-"insensibles à la casse)"
+msgstr "C'est la même chose que `gitdir` sauf que la correspondance se fait sans tenir compte de la casse (par exemple sur les systèmes de fichiers insensibles à la casse)"
#. type: Labeled list
#: en/config.txt:148
@@ -2456,66 +2265,43 @@ msgstr "`onbranch`"
#: en/config.txt:155
#, priority:100
msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met."
-msgstr ""
-"Les données qui suivent le mot-clé `onbranch:` sont considérées comme un "
-"motif avec des jokers standard et deux autres, `**/` et `/**`, qui peuvent "
-"correspondre à plusieurs composants de chemin. Si nous nous trouvons dans "
-"un arbre de travail où le nom de la branche actuellement extraite correspond "
-"au motif, la condition d'inclusion est remplie."
+msgstr "Les données qui suivent le mot-clé `onbranch:` sont considérées comme un motif avec des jokers standard et deux autres, `**/` et `/**`, qui peuvent correspondre à plusieurs composants de chemin. Si nous nous trouvons dans un arbre de travail où le nom de la branche actuellement extraite correspond au motif, la condition d'inclusion est remplie."
#. type: Plain text
#: en/config.txt:161
#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy."
-msgstr ""
-"Si le motif se termine par `/`, `**` sera automatiquement ajouté. Par "
-"exemple, le motif `foo/` devient `foo/**`. En d'autres termes, il correspond "
-"à toutes les branches qui commencent par `foo/`. Ceci est utile si vos "
-"branches sont organisées de manière hiérarchique et que vous souhaitez "
-"appliquer une configuration à toutes les branches de cette hiérarchie."
+msgstr "Si le motif se termine par `/`, `**` sera automatiquement ajouté. Par exemple, le motif `foo/` devient `foo/**`. En d'autres termes, il correspond à toutes les branches qui commencent par `foo/`. Ceci est utile si vos branches sont organisées de manière hiérarchique et que vous souhaitez appliquer une configuration à toutes les branches de cette hiérarchie."
#. type: Plain text
#: en/config.txt:163
#, priority:100
msgid "A few more notes on matching via `gitdir` and `gitdir/i`:"
-msgstr ""
-"Quelques notes supplémentaires sur la correspondance via `gitdir` et `gitdir/"
-"i` :"
+msgstr "Quelques notes supplémentaires sur la correspondance via `gitdir` et `gitdir/i` :"
#. type: Plain text
#: en/config.txt:165
#, priority:100
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
-msgstr ""
-"Les liens symboliques dans `$GIT_DIR` ne sont pas résolus avant la "
-"correspondance."
+msgstr "Les liens symboliques dans `$GIT_DIR` ne sont pas résolus avant la correspondance."
#. type: Plain text
#: en/config.txt:170
#, priority:100
msgid "Both the symlink & realpath versions of paths will be matched outside of `$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
-msgstr ""
-"Les versions symlink et realpath des chemins seront comparées en dehors de "
-"`$GIT_DIR`. Par exemple, si ~/git est un lien symbolique vers /mnt/stockage/"
-"git, `gitdir:~/git` et `gitdir:/mnt/stockage/git` correspondront tous deux."
+msgstr "Les versions symlink et realpath des chemins seront comparées en dehors de `$GIT_DIR`. Par exemple, si ~/git est un lien symbolique vers /mnt/stockage/git, `gitdir:~/git` et `gitdir:/mnt/stockage/git` correspondront tous deux."
#. type: Plain text
#: en/config.txt:175
#, priority:100
msgid "This was not the case in the initial release of this feature in v2.13.0, which only matched the realpath version. Configuration that wants to be compatible with the initial release of this feature needs to either specify only the realpath version, or both versions."
-msgstr ""
-"Ce n'était pas le cas dans la version initiale de cette fonctionnalité dans "
-"la v2.13.0, qui ne correspondait qu'à la version realpath. La configuration "
-"qui veut être compatible avec la version initiale de cette fonctionnalité "
-"doit soit spécifier uniquement la version realpath, soit les deux versions."
+msgstr "Ce n'était pas le cas dans la version initiale de cette fonctionnalité dans la v2.13.0, qui ne correspondait qu'à la version realpath. La configuration qui veut être compatible avec la version initiale de cette fonctionnalité doit soit spécifier uniquement la version realpath, soit les deux versions."
#. type: Plain text
#: en/config.txt:178
#, priority:100
msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want."
-msgstr ""
-"Notez que \"../\" n'est pas spécial et correspondra littéralement, ce qui "
-"est peu probablement ce que vous voulez."
+msgstr "Notez que \"../\" n'est pas spécial et correspondra littéralement, ce qui est peu probablement ce que vous voulez."
#. type: Title ~
#: en/config.txt:180 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
@@ -2667,10 +2453,7 @@ msgstr "Valeurs"
#: en/config.txt:237
#, priority:100
msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them."
-msgstr ""
-"Les valeurs de nombreuses variables sont traitées comme une simple chaîne de "
-"caractères, mais il existe des variables qui prennent des valeurs de types "
-"spécifiques et il existe des règles quant à leur orthographe."
+msgstr "Les valeurs de nombreuses variables sont traitées comme une simple chaîne de caractères, mais il existe des variables qui prennent des valeurs de types spécifiques et il existe des règles quant à leur orthographe."
#. type: Labeled list
#: en/config.txt:238
@@ -2682,9 +2465,7 @@ msgstr "booléen"
#: en/config.txt:243
#, priority:100
msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive."
-msgstr ""
-"Lorsqu'une variable prend une valeur booléenne, de nombreux synonymes sont "
-"acceptés pour 'vrai' et 'faux' ; ils sont tous insensibles à la casse."
+msgstr "Lorsqu'une variable prend une valeur booléenne, de nombreux synonymes sont acceptés pour 'vrai' et 'faux' ; ils sont tous insensibles à la casse."
#. type: Labeled list
#: en/config.txt:244
@@ -2692,18 +2473,10 @@ msgstr ""
msgid "true"
msgstr "true"
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr "Les vrais littéraux booléens sont `yes`, `on`, `true`,"
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2712,26 +2485,18 @@ msgstr ""
msgid "false"
msgstr "faux"
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "Boolean true literals are `yes`, `on`, `true`,"
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
+msgstr "Les vrais littéraux booléens sont `yes`, `on`, `true`,"
#. type: Plain text
#: en/config.txt:254
#, priority:100
msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
-msgstr ""
-"Lors de la conversion d'une valeur sous sa forme canonique en utilisant le "
-"spécificateur de type `--type=bool`, 'git config' s'assurera que la sortie "
-"est \"true\" ou \"false\" (écrit en minuscules)."
+msgstr "Lors de la conversion d'une valeur sous sa forme canonique en utilisant le spécificateur de type `--type=bool`, 'git config' s'assurera que la sortie est \"true\" ou \"false\" (écrit en minuscules)."
#. type: Labeled list
#: en/config.txt:255
@@ -2743,10 +2508,7 @@ msgstr "Entier"
#: en/config.txt:259
#, ignore-ellipsis, priority:100
msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
-msgstr ""
-"La valeur de nombreuses variables qui spécifient différentes tailles peut "
-"être suffixée par `k`, `M`, ... pour signifier « multiplier le nombre par "
-"1024 », « par 1024x1024 », etc."
+msgstr "La valeur de nombreuses variables qui spécifient différentes tailles peut être suffixée par `k`, `M`, ... pour signifier « multiplier le nombre par 1024 », « par 1024x1024 », etc."
#. type: Labeled list
#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175
@@ -2758,67 +2520,37 @@ msgstr "color"
#: en/config.txt:264
#, priority:100
msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces."
-msgstr ""
-"La valeur d’une variable qui prend une couleur est une liste de couleurs (au "
-"plus deux, une pour le premier plan et une pour l’arrière-plan) et les "
-"attributs (autant que vous le souhaitez), séparés par des espaces."
+msgstr "La valeur d’une variable qui prend une couleur est une liste de couleurs (au plus deux, une pour le premier plan et une pour l’arrière-plan) et les attributs (autant que vous le souhaitez), séparés par des espaces."
#. type: Plain text
#: en/config.txt:270
#, priority:100
msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
-msgstr ""
-"Les couleurs de base acceptées sont `normal`, `black`, `red`, `green`, "
-"`yellow`, `blue`, `magenta`, `cyan` et `white`. La première couleur donnée "
-"est le premier plan ; la seconde est l'arrière-plan. Toutes les couleurs de "
-"base, sauf la couleur `normal`, ont une variante claire qui peut être "
-"spécifiée en préfixant la couleur par `bright`, comme `brightred`."
+msgstr "Les couleurs de base acceptées sont `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` et `white`. La première couleur donnée est le premier plan ; la seconde est l'arrière-plan. Toutes les couleurs de base, sauf la couleur `normal`, ont une variante claire qui peut être spécifiée en préfixant la couleur par `bright`, comme `brightred`."
#. type: Plain text
#: en/config.txt:275
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
-msgstr ""
-"Les couleurs peuvent également être données en tant que nombres entre 0 et "
-"255 ; ceux-ci utilisent le mode ANSI 256 couleurs (mais notez que certains "
-"terminaux ne peuvent pas prendre en charge cela). Si votre terminal le "
-"prend en charge, vous pouvez également spécifier des valeurs RGB 24 bits en "
-"hexadécimal, comme `#ff0ab3`."
+msgstr "Les couleurs peuvent également être données en tant que nombres entre 0 et 255 ; ceux-ci utilisent le mode ANSI 256 couleurs (mais notez que certains terminaux ne peuvent pas prendre en charge cela). Si votre terminal le prend en charge, vous pouvez également spécifier des valeurs RGB 24 bits en hexadécimal, comme `#ff0ab3`."
#. type: Plain text
#: en/config.txt:282
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
-msgstr ""
-"Les attributs acceptés sont `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`"
-", et `strike` (pour les lettres barrées ou \"surlignées\"). La position de "
-"tout attribut par rapport aux couleurs (avant, après ou entre les deux) n'a "
-"pas d'importance. Des attributs spécifiques peuvent être désactivés en les "
-"préfixant par `no` ou `no-` (par exemple, `noreverse`, `no-ul`, etc.)."
+msgstr "Les attributs acceptés sont `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, et `strike` (pour les lettres barrées ou \"surlignées\"). La position de tout attribut par rapport aux couleurs (avant, après ou entre les deux) n'a pas d'importance. Des attributs spécifiques peuvent être désactivés en les préfixant par `no` ou `no-` (par exemple, `noreverse`, `no-ul`, etc.)."
#. type: Plain text
#: en/config.txt:285
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
-msgstr ""
-"Une chaîne de couleur vide ne produit aucun effet de couleur. Cela peut être "
-"utilisé pour éviter de colorer des éléments spécifiques sans désactiver "
-"complètement la couleur."
+msgstr "Une chaîne de couleur vide ne produit aucun effet de couleur. Cela peut être utilisé pour éviter de colorer des éléments spécifiques sans désactiver complètement la couleur."
#. type: Plain text
#: en/config.txt:294
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
-msgstr ""
-"Pour les étiquettes de couleur prédéfinies de git, les attributs sont censés "
-"être réinitialisés au début de chaque élément de la sortie colorée. Ainsi, "
-"mettre `color.decorate.branch` à `black` peindra le nom de cette branche en "
-"un simple `black`, même si la chose précédente sur la même ligne de sortie ("
-"par exemple, ouvrir une parenthèse avant la liste des noms de branches dans "
-"la sortie de `log --decorate`) est mise à être peinte avec `bold` ou un "
-"autre attribut. Cependant, les formats de log personnalisés peuvent faire "
-"une coloration plus compliquée et plus stratifiée, et les formes inversées "
-"peuvent être utiles dans ce cas."
+msgstr "Pour les étiquettes de couleur prédéfinies de git, les attributs sont censés être réinitialisés au début de chaque élément de la sortie colorée. Ainsi, mettre `color.decorate.branch` à `black` peindra le nom de cette branche en un simple `black`, même si la chose précédente sur la même ligne de sortie (par exemple, ouvrir une parenthèse avant la liste des noms de branches dans la sortie de `log --decorate`) est mise à être peinte avec `bold` ou un autre attribut. Cependant, les formats de log personnalisés peuvent faire une coloration plus compliquée et plus stratifiée, et les formes inversées peuvent être utiles dans ce cas."
#. type: Labeled list
#: en/config.txt:295
@@ -2830,11 +2562,7 @@ msgstr "nom-de-chemin"
#: en/config.txt:301
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
-msgstr ""
-"Une variable qui prend la valeur d'un nom de chemin peut recevoir une chaîne "
-"de caractères commençant par \"`~/`\" ou \"`~user/`\", et l'expansion tilde "
-"habituelle se fait sur une telle chaîne : `~/` est développée à la valeur de "
-"`$HOME`, et `~user/` au répertoire personnel de l'utilisateur spécifié."
+msgstr "Une variable qui prend la valeur d'un nom de chemin peut recevoir une chaîne de caractères commençant par \"`~/`\" ou \"`~user/`\", et l'expansion tilde habituelle se fait sur une telle chaîne : `~/` est développée à la valeur de `$HOME`, et `~user/` au répertoire personnel de l'utilisateur spécifié."
#. type: Title ~
#: en/config.txt:304
@@ -2846,21 +2574,13 @@ msgstr "Variables"
#: en/config.txt:309
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
-msgstr ""
-"Notez que cette liste n'est pas exhaustive et n'est pas nécessairement "
-"complète. Pour les variables spécifiques à une commande, vous trouverez une "
-"description plus détaillée dans la page du manuel appropriée."
+msgstr "Notez que cette liste n'est pas exhaustive et n'est pas nécessairement complète. Pour les variables spécifiques à une commande, vous trouverez une description plus détaillée dans la page du manuel appropriée."
#. type: Plain text
#: en/config.txt:314
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
-msgstr ""
-"D'autres outils liés à git peuvent utiliser et utilisent leurs propres "
-"variables. Lorsque vous inventez de nouvelles variables à utiliser dans "
-"votre propre outil, assurez-vous que leurs noms n'entrent pas en conflit "
-"avec ceux qui sont utilisés par Git lui-même et d'autres outils populaires, "
-"et décrivez-les dans votre documentation."
+msgstr "D'autres outils liés à git peuvent utiliser et utilisent leurs propres variables. Lorsque vous inventez de nouvelles variables à utiliser dans votre propre outil, assurez-vous que leurs noms n'entrent pas en conflit avec ceux qui sont utilisés par Git lui-même et d'autres outils populaires, et décrivez-les dans votre documentation."
#. type: Labeled list
#: en/config/merge.txt:1
@@ -3088,21 +2808,13 @@ msgstr "merge.suppressDest"
#: en/config/fmt-merge-msg.txt:18
#, priority:240
msgid "By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit \"into <branch name>\" from its title."
-msgstr ""
-"En ajoutant à cette variable de configuration à valeurs multiples un motif "
-"qui correspond aux noms des branches d'intégration, le message de fusion par "
-"défaut calculé pour les fusions dans ces branches d'intégration omettra "
-"\"into <nom de branche>\" dans son titre."
+msgstr "En ajoutant à cette variable de configuration à valeurs multiples un motif qui correspond aux noms des branches d'intégration, le message de fusion par défaut calculé pour les fusions dans ces branches d'intégration omettra \"into <nom de branche>\" dans son titre."
#. type: Plain text
#: en/config/fmt-merge-msg.txt:22
#, priority:240
msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility."
-msgstr ""
-"Un élément avec une valeur vide peut être utilisé pour effacer la liste des "
-"motifs accumulés dans les entrées de configuration précédentes. "
-"Lorsqu'aucune variable `merge.suppressDest` n'est définie, la valeur par "
-"défaut de `master` est utilisée par rétrocompatibilité."
+msgstr "Un élément avec une valeur vide peut être utilisé pour effacer la liste des motifs accumulés dans les entrées de configuration précédentes. Lorsqu'aucune variable `merge.suppressDest` n'est définie, la valeur par défaut de `master` est utilisée par rétrocompatibilité."
#. type: Title -
#: en/date-formats.txt:2
@@ -3162,12 +2874,7 @@ msgstr "ISO 8601"
#: en/date-formats.txt:26
#, priority:280
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
-msgstr ""
-"Les heures et les dates sont spécifiées par le standard ISO 8601, par "
-"exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu "
-"du caractère `T`. Les parties fractionnelles d'une seconde seront ignorées, "
-"par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant "
-"`2005-04-07T22:13:13`."
+msgstr "Les heures et les dates sont spécifiées par le standard ISO 8601, par exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu du caractère `T`. Les parties fractionnelles d'une seconde seront ignorées, par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant `2005-04-07T22:13:13`."
#. type: Plain text
#: en/date-formats.txt:28
@@ -3661,12 +3368,7 @@ msgstr "Génération du texte de rustine avec -p"
#: en/diff-generate-patch.txt:15
#, priority:260
msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
-msgstr ""
-"Exécuter linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], "
-"linkgit:git-diff-index[1], linkgit:git-diff-tree[1] ou linkgit:git-diff-"
-"files[1] avec l'option `-p` produit le texte de rustine. Vous pouvez "
-"personnaliser la création du texte de rustine via les variables "
-"d'environnement `GIT_EXTERNAL_DIFF` et `GIT_DIFF_OPTS` (voir linkgit:git[1])."
+msgstr "Exécuter linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1] ou linkgit:git-diff-files[1] avec l'option `-p` produit le texte de rustine. Vous pouvez personnaliser la création du texte de rustine via les variables d'environnement `GIT_EXTERNAL_DIFF` et `GIT_DIFF_OPTS` (voir linkgit:git[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:18
@@ -4988,14 +4690,7 @@ msgstr "--abbrev[=<n>]"
#: en/diff-options.txt:454
#, priority:280
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
-msgstr ""
-"Au lieu de montrer le nom de l'objet avec les 40 caractères hexadécimaux "
-"dans le format de diff brut et les lignes d'entête de l'arbre de diff, ne "
-"montrer qu'un préfixe partiel. Dans le format de sortie de rustine de "
-"correctif, `--full-index` a une priorité plus élevée, c'est-à-dire si "
-"`--full-index` est spécifié, les noms de blob complets seront affichés "
-"indépendamment de `--abbrev`. Un nombre de chiffres différent de celui par "
-"défaut peut être spécifié avec `--abbrev=<n>`."
+msgstr "Au lieu de montrer le nom de l'objet avec les 40 caractères hexadécimaux dans le format de diff brut et les lignes d'entête de l'arbre de diff, ne montrer qu'un préfixe partiel. Dans le format de sortie de rustine de correctif, `--full-index` a une priorité plus élevée, c'est-à-dire si `--full-index` est spécifié, les noms de blob complets seront affichés indépendamment de `--abbrev`. Un nombre de chiffres différent de celui par défaut peut être spécifié avec `--abbrev=<n>`."
#. type: Labeled list
#: en/diff-options.txt:455
@@ -5361,14 +5056,7 @@ msgstr "--no-relative"
#: en/diff-options.txt:664
#, 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."
+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:665 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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
@@ -5770,11 +5458,7 @@ msgstr "--[no-]write-fetch-head"
#: en/fetch-options.txt:74
#, 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."
+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:76 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:153
@@ -5862,10 +5546,7 @@ msgstr "--[no-]auto-gc"
#: en/fetch-options.txt:103
#, 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."
+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:104
@@ -6021,11 +5702,7 @@ msgstr "--set-upstream"
#: en/fetch-options.txt:205
#, 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]."
+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:207
@@ -7101,11 +6778,7 @@ msgstr "--message-id"
#: en/git-am.txt:68
#, priority:100
msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour."
-msgstr ""
-"Passer le drapeau `-m` à 'git mailinfo' (voir linkgit:git-mailinfo[1]), de "
-"sorte que l'en-tête Message-ID soit ajouté au message de validation. La "
-"variable de configuration `am.messageid` peut être utilisée pour spécifier "
-"le comportement par défaut."
+msgstr "Passer le drapeau `-m` à 'git mailinfo' (voir linkgit:git-mailinfo[1]), de sorte que l'en-tête Message-ID soit ajouté au message de validation. La variable de configuration `am.messageid` peut être utilisée pour spécifier le comportement par défaut."
#. type: Labeled list
#: en/git-am.txt:69
@@ -7253,9 +6926,7 @@ msgstr "--reject"
#: en/git-am.txt:119
#, priority:100
msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
-msgstr ""
-"Ces drapeaux sont transmis au programme 'git apply' (voir linkgit:git-"
-"apply[1]) qui applique le patch."
+msgstr "Ces drapeaux sont transmis au programme 'git apply' (voir linkgit:git-apply[1]) qui applique le patch."
#. type: Labeled list
#: en/git-am.txt:120
@@ -7267,12 +6938,7 @@ msgstr "--patch-format"
#: en/git-am.txt:126
#, priority:100
msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
-msgstr ""
-"Par défaut, la commande tentera de détecter automatiquement le format de la "
-"rustine. Cette option permet à l'utilisateur de contourner la détection "
-"automatique et de spécifier le format de rustine comme lequel la(les) "
-"rustine(s) doit/doivent être interprétée(s). Les formats valides sont mbox, "
-"mboxrd, stgit, stgit-series et hg."
+msgstr "Par défaut, la commande tentera de détecter automatiquement le format de la rustine. Cette option permet à l'utilisateur de contourner la détection automatique et de spécifier le format de rustine comme lequel la(les) rustine(s) doit/doivent être interprétée(s). Les formats valides sont mbox, mboxrd, stgit, stgit-series et hg."
#. type: Plain text
#: en/git-am.txt:130
@@ -7290,11 +6956,7 @@ msgstr "--committer-date-is-author-date"
#: en/git-am.txt:137
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
-msgstr ""
-"Par défaut, la commande enregistre la date du message électronique comme "
-"date de l'auteur du commit, et utilise l'heure de création du commit comme "
-"date du validateur. Cela permet à l'utilisateur de mentir sur la date du "
-"validateur en utilisant la même valeur que la date de l'auteur."
+msgstr "Par défaut, la commande enregistre la date du message électronique comme date de l'auteur du commit, et utilise l'heure de création du commit comme date du validateur. Cela permet à l'utilisateur de mentir sur la date du validateur en utilisant la même valeur que la date de l'auteur."
#. type: Labeled list
#: en/git-am.txt:138 en/git-rebase.txt:490
@@ -7306,11 +6968,7 @@ msgstr "--ignore-date"
#: en/git-am.txt:144
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date."
-msgstr ""
-"Par défaut, la commande enregistre la date du message électronique comme "
-"date de l'auteur du commit, et utilise l'heure de création du commit comme "
-"date du committeur. Cela permet à l'utilisateur de mentir sur la date de "
-"l'auteur en utilisant la même valeur que la date du validateur."
+msgstr "Par défaut, la commande enregistre la date du message électronique comme date de l'auteur du commit, et utilise l'heure de création du commit comme date du committeur. Cela permet à l'utilisateur de mentir sur la date de l'auteur en utilisant la même valeur que la date du validateur."
#. type: Labeled list
#: en/git-am.txt:145 en/git-rebase.txt:336 en/sequencer.txt:6
@@ -7322,9 +6980,7 @@ msgstr "--skip"
#: en/git-am.txt:148
#, priority:100
msgid "Skip the current patch. This is only meaningful when restarting an aborted patch."
-msgstr ""
-"Sauter la rustine actuelle. Cela n'a de sens que si l'on redémarre une "
-"rustine avortée."
+msgstr "Sauter la rustine actuelle. Cela n'a de sens que si l'on redémarre une rustine avortée."
#. type: Labeled list
#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
@@ -7372,12 +7028,7 @@ msgstr "--resolved"
#: en/git-am.txt:167
#, priority:100
msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue."
-msgstr ""
-"Après l'échec d'une rustine (par exemple, en cas de tentative d'application "
-"d'une rustine conflictuelle), l'utilisateur l'a appliquée à la main et le "
-"fichier d'index stocke le résultat de l'application. Faire un commit en "
-"utilisant le journal des auteurs et du commit extrait du message "
-"électronique et du fichier d'index actuel, et continuer."
+msgstr "Après l'échec d'une rustine (par exemple, en cas de tentative d'application d'une rustine conflictuelle), l'utilisateur l'a appliquée à la main et le fichier d'index stocke le résultat de l'application. Faire un commit en utilisant le journal des auteurs et du commit extrait du message électronique et du fichier d'index actuel, et continuer."
#. type: Labeled list
#: en/git-am.txt:168
@@ -7389,11 +7040,7 @@ msgstr "--resolvemsg=<msg>"
#: en/git-am.txt:174
#, priority:100
msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'."
-msgstr ""
-"En cas de défaillance d'un patch, <msg> sera imprimé à l'écran avant de "
-"sortir. Ceci remplace le message standard vous informant d'utiliser "
-"`--continue` ou `--skip` pour gérer l'échec. Ceci est uniquement pour un "
-"usage interne entre 'git rebase' et 'git am'."
+msgstr "En cas de défaillance d'un patch, <msg> sera imprimé à l'écran avant de sortir. Ceci remplace le message standard vous informant d'utiliser `--continue` ou `--skip` pour gérer l'échec. Ceci est uniquement pour un usage interne entre 'git rebase' et 'git am'."
#. type: Labeled list
#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15
@@ -7417,8 +7064,7 @@ msgstr "--quit"
#: en/git-am.txt:181
#, priority:100
msgid "Abort the patching operation but keep HEAD and the index untouched."
-msgstr ""
-"Abandonner l'opération de rustinage mais garder HEAD et l'index intacts."
+msgstr "Abandonner l'opération de rustinage mais garder HEAD et l'index intacts."
#. type: Labeled list
#: en/git-am.txt:182
@@ -7430,10 +7076,7 @@ msgstr "--show-current-patch[=(diff|raw)]"
#: en/git-am.txt:187
#, priority:100
msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `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`."
+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:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:226 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:81 en/git-stash.txt:245 en/git-tag.txt:231
@@ -7445,38 +7088,25 @@ msgstr "DISCUSSION"
#: en/git-am.txt:197
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
-msgstr ""
-"Le nom de l'auteur du commit est tiré du \"From: \"et la date de l'auteur du "
-"commit est tirée de la ligne \"Date:\" du message. Le \"Subject:\" est "
-"utilisé comme titre du commit, après avoir supprimé le préfixe commun \"["
-"PATCH <quelque chose>]\". La ligne \"Subject:\"est censée décrire de "
-"manière concise l'objet du commit en une seule ligne de texte."
+msgstr "Le nom de l'auteur du commit est tiré du \"From: \"et la date de l'auteur du commit est tirée de la ligne \"Date:\" du message. Le \"Subject:\" est utilisé comme titre du commit, après avoir supprimé le préfixe commun \"[PATCH <quelque chose>]\". La ligne \"Subject:\"est censée décrire de manière concise l'objet du commit en une seule ligne de texte."
#. type: Plain text
#: en/git-am.txt:200
#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
-msgstr ""
-"Les lignes «From:», «Date:» et «Subject:» commençant le corps remplacent le "
-"nom de l'auteur de la validation et les valeurs de titre respectives tirées "
-"des en-têtes."
+msgstr "Les lignes «From:», «Date:» et «Subject:» commençant le corps remplacent le nom de l'auteur de la validation et les valeurs de titre respectives tirées des en-têtes."
#. type: Plain text
#: en/git-am.txt:205
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
-msgstr ""
-"Le message de validation est formé par le titre tiré du \"Subject:\", une "
-"ligne vide et le corps du message jusqu'au début du patch. Les espaces en "
-"excès à la fin de chaque ligne sont automatiquement supprimés."
+msgstr "Le message de validation est formé par le titre tiré du \"Subject:\", une ligne vide et le corps du message jusqu'au début du patch. Les espaces en excès à la fin de chaque ligne sont automatiquement supprimés."
#. type: Plain text
#: en/git-am.txt:208
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
-msgstr ""
-"La rustine devrait être incluse, à la suite immédiate du message. Toute "
-"ligne qui est de la forme :"
+msgstr "La rustine devrait être incluse, à la suite immédiate du message. Toute ligne qui est de la forme :"
#. type: Plain text
#: en/git-am.txt:210
@@ -7500,9 +7130,7 @@ msgstr "une ligne qui commence par \"Index : \""
#: en/git-am.txt:215
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
-msgstr ""
-"est pris comme le début d'une rustine, et le message de journal de "
-"validation est terminé avant la première occurrence d'une telle ligne."
+msgstr "est pris comme le début d'une rustine, et le message de journal de validation est terminé avant la première occurrence d'une telle ligne."
#. type: Plain text
#: en/git-am.txt:219
@@ -7514,38 +7142,25 @@ msgstr ""
#: en/git-am.txt:222
#, priority:100
msgid "skip the current patch by re-running the command with the `--skip` option."
-msgstr ""
-"sauter la rustine en cours en relançant la commande avec l'option `--skip`."
+msgstr "sauter la rustine en cours en relançant la commande avec l'option `--skip`."
#. type: Plain text
#: en/git-am.txt:226
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
-msgstr ""
-"résoudre manuellement le conflit dans le répertoire de travail, et mettre à "
-"jour le fichier d'index pour le mettre dans un état que la rustine aurait dû "
-"produire. Ensuite, lancer la commande avec l'option `--continue`."
+msgstr "résoudre manuellement le conflit dans le répertoire de travail, et mettre à jour le fichier d'index pour le mettre dans un état que la rustine aurait dû produire. Ensuite, lancer la commande avec l'option `--continue`."
#. type: Plain text
#: en/git-am.txt:231
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
-msgstr ""
-"La commande refuse de traiter de nouvelles boîtes aux lettres tant que "
-"l'opération en cours n'est pas terminée, donc si vous décidez de repartir de "
-"zéro, lancez `git am --abort` avant d'exécuter la commande avec les noms des "
-"boîtes aux lettres."
+msgstr "La commande refuse de traiter de nouvelles boîtes aux lettres tant que l'opération en cours n'est pas terminée, donc si vous décidez de repartir de zéro, lancez `git am --abort` avant d'exécuter la commande avec les noms des boîtes aux lettres."
#. type: Plain text
#: en/git-am.txt:237
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
-msgstr ""
-"Avant l'application de tout correctif, ORIG_HEAD est placé au sommet de la "
-"branche en cours. C'est utile si vous avez des problèmes avec plusieurs "
-"commits, par exemple si vous lancez 'git am' sur la mauvaise branche ou si "
-"une erreur dans les commits est plus facilement corrigée en changeant de "
-"boîte aux lettres (par exemple des erreurs dans les lignes \"From :\")."
+msgstr "Avant l'application de tout correctif, ORIG_HEAD est placé au sommet de la branche en cours. C'est utile si vous avez des problèmes avec plusieurs commits, par exemple si vous lancez 'git am' sur la mauvaise branche ou si une erreur dans les commits est plus facilement corrigée en changeant de boîte aux lettres (par exemple des erreurs dans les lignes \"From :\")."
#. type: Title -
#: en/git-am.txt:239 en/git-commit.txt:521 en/git-gc.txt:146
@@ -7575,8 +7190,7 @@ msgstr "git-annotate(1)"
#: en/git-annotate.txt:7
#, priority:100
msgid "git-annotate - Annotate file lines with commit information"
-msgstr ""
-"git-annotate - Annote les lignes d'un fichier avec les informations de commit"
+msgstr "git-annotate - Annote les lignes d'un fichier avec les informations de commit"
#. type: Plain text
#: en/git-annotate.txt:12
@@ -7588,10 +7202,7 @@ msgstr "'git annotate' [<options>] <fichier> [<révision>]\n"
#: en/git-annotate.txt:17
#, priority:100
msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision."
-msgstr ""
-"Annote chaque ligne dans le fichier donné avec les informations du commit "
-"qui a introduit la ligne. Annote optionnellement à partir d'une révision "
-"donnée."
+msgstr "Annote chaque ligne dans le fichier donné avec les informations du commit qui a introduit la ligne. Annote optionnellement à partir d'une révision donnée."
#. type: Plain text
#: en/git-annotate.txt:22
@@ -10196,9 +9807,7 @@ msgstr "--merged [<commit>]"
#: en/git-branch.txt:256
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"N'indiquer que les branches dont les sommets sont accessibles depuis le "
-"commit spécifié (HEAD si non spécifié). Implique `--list`."
+msgstr "N'indiquer que les branches dont les sommets sont accessibles depuis le commit spécifié (HEAD si non spécifié). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:257 en/git-tag.txt:154
@@ -10210,9 +9819,7 @@ msgstr "--no-merged [<commit>]"
#: en/git-branch.txt:260
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"N'indiquer que les branches dont les sommets sont accessibles depuis le "
-"commit spécifié (HEAD si non spécifié). Implique `--list`."
+msgstr "N'indiquer que les branches dont les sommets sont accessibles depuis le commit spécifié (HEAD si non spécifié). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:261
@@ -10397,7 +10004,7 @@ msgid "Patterns will normally need quoting."
msgstr "Les motifs devront normalement être cités."
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr "NOTES"
@@ -14327,19 +13934,14 @@ msgid ""
"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 ""
-"*NOTE* : c'est une opération potentiellement dangereuse ; *ne* l'utilisez "
-"*pas*\n"
-"à moins de comprendre ce qu'elle fait. Si vous clonez votre dépôt en "
-"utilisant\n"
+"*NOTE* : c'est une opération potentiellement dangereuse ; *ne* l'utilisez *pas*\n"
+"à moins de comprendre ce qu'elle fait. Si vous clonez votre dépôt en utilisant\n"
"cette option puis que vous supprimez des branches (ou utilisez toute autre\n"
-"commande Git qui élimine les références sur un commit existant) dans le "
-"dépôt\n"
+"commande Git qui élimine les références sur un commit existant) dans le dépôt\n"
"source, certains objets peuvent ne plus être référencés (ou esseulés).\n"
-"Ces objets pourraient être supprimés lors d'opérations normales de Git ("
-"telles\n"
+"Ces objets pourraient être supprimés lors d'opérations normales de Git (telles\n"
"que `git commit`) qui appellent automatiquement `git maintenance --auto`.\n"
-" (Voir linkgit:git-maintenance[1].) Si ces objets sont supprimés et qu'ils "
-"étaient\n"
+" (Voir linkgit:git-maintenance[1].) Si ces objets sont supprimés et qu'ils étaient\n"
"référencés dans un dépôt cloné, alors le dépôt cloné sera corrompu.\n"
#. type: Plain text
@@ -17768,17 +17370,12 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
-msgstr ""
+#, fuzzy, priority:100
+#| msgid "Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working directory."
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
+msgstr "Traiter le dépôt comme un dépôt nu. Si l'environnement `GIT_DIR` n'est pas défini, alors il est défini au répertoire de travail actuel."
#. type: Labeled list
#: en/git-cvsimport.txt:71
@@ -20458,11 +20055,7 @@ msgstr ""
#: en/git-diff.txt:25
#, priority:280
msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
-msgstr ""
-"Affiche les modifications entre l'arbre de travail et l'index ou un arbre, "
-"les modifications entre l'index et un arbre, les modifications entre deux "
-"arbres, les modifications résultant d'une fusion, les modifications entre "
-"deux objets blobs ou les modifications entre deux fichiers sur disque."
+msgstr "Affiche les modifications entre l'arbre de travail et l'index ou un arbre, les modifications entre l'index et un arbre, les modifications entre deux arbres, les modifications résultant d'une fusion, les modifications entre deux objets blobs ou les modifications entre deux fichiers sur disque."
#. type: Labeled list
#: en/git-diff.txt:26
@@ -20546,10 +20139,7 @@ msgstr "'git diff' [<options>] <commit>..<commit> [--] [<chemin>...]"
#: en/git-diff.txt:81
#, 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."
+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:82
@@ -20781,9 +20371,7 @@ msgstr "Affiche les diff inversés."
#: en/git-diff.txt:213
#, 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]"
+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]"
#. type: Title =
#: en/git-fast-export.txt:2
@@ -21372,16 +20960,10 @@ msgstr "--rewrite-submodules-from=<nom>:<fichier>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nom>:<fichier>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -23205,17 +22787,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -23231,18 +22808,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -23801,10 +23372,7 @@ msgstr "Les noms des refs qui sont récupérés, ainsi que les noms des objets q
#: en/git-fetch.txt:54
#, priority:220
msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported."
-msgstr ""
-"Lire les spécifications de référence, une par ligne, de stdin en plus de "
-"celles fournies comme arguments. Le format \"tag <nom>\" n'est pas pris en "
-"charge."
+msgstr "Lire les spécifications de référence, une par ligne, de stdin en plus de celles fournies comme arguments. Le format \"tag <nom>\" n'est pas pris en charge."
#. type: Title -
#: en/git-fetch.txt:59
@@ -24196,18 +23764,13 @@ msgstr "$ git fetch origin +seen:seen maint:tmp\n"
#: en/git-fetch.txt:268
#, priority:220
msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository."
-msgstr ""
-"Cela met à jour (ou crée, si nécessaire) les branches `seen` et `tmp` dans "
-"le dépôt local en récupérant (respectivement) les branches `seen` et `maint` "
-"dans le dépôt distant."
+msgstr "Cela met à jour (ou crée, si nécessaire) les branches `seen` et `tmp` dans le dépôt local en récupérant (respectivement) les branches `seen` et `maint` dans le dépôt distant."
#. type: Plain text
#: en/git-fetch.txt:271
#, priority:220
msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
-msgstr ""
-"La branche `seen` sera mise à jour même si ce n'est pas en avance rapide, "
-"car elle est préfixée par un signe plus ; `tmp` ne le sera pas."
+msgstr "La branche `seen` sera mise à jour même si ce n'est pas en avance rapide, car elle est préfixée par un signe plus ; `tmp` ne le sera pas."
#. type: Plain text
#: en/git-fetch.txt:274
@@ -25359,9 +24922,7 @@ msgstr "--merged[=<objet>]"
#: en/git-for-each-ref.txt:80
#, priority:100
msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)."
-msgstr ""
-"Ne lister que les références dont les sommets sont accessibles à partir du "
-"commit spécifié (HEAD si non spécifié)."
+msgstr "Ne lister que les références dont les sommets sont accessibles à partir du commit spécifié (HEAD si non spécifié)."
#. type: Labeled list
#: en/git-for-each-ref.txt:81
@@ -25373,9 +24934,7 @@ msgstr "--no-merged[=<objet>]"
#: en/git-for-each-ref.txt:84
#, priority:100
msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)."
-msgstr ""
-"Ne lister que les références dont les sommets ne sont pas accessibles à "
-"partir du commit spécifié (HEAD si non spécifié)."
+msgstr "Ne lister que les références dont les sommets ne sont pas accessibles à partir du commit spécifié (HEAD si non spécifié)."
#. type: Labeled list
#: en/git-for-each-ref.txt:85
@@ -26604,7 +26163,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -28079,11 +27638,7 @@ msgstr ""
#: en/git-grep.txt:213
#, priority:100
msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
-msgstr ""
-"Utiliser \\ 0 comme délimiteur pour les noms de chemin dans la sortie et les "
-"afficher verbatim. 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])."
+msgstr "Utiliser \\ 0 comme délimiteur pour les noms de chemin dans la sortie et les afficher verbatim. 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/git-grep.txt:215
@@ -31324,11 +30879,7 @@ msgstr "Affiche les journaux de validation."
#: en/git-log.txt:25
#, priority:260
msgid "The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to the linkgit:git-diff[1] command to control how the changes each commit introduces are shown."
-msgstr ""
-"La commande prend les options applicables à la commande linkgit:git-rev-"
-"list[1] pour contrôler ce qui est montré et comment, et les options "
-"applicables aux commandes linkgit:git-diff[1] pour contrôler la façon dont "
-"les modifications que chaque validation introduit sont affichées."
+msgstr "La commande prend les options applicables à la commande linkgit:git-rev-list[1] pour contrôler ce qui est montré et comment, et les options applicables aux commandes linkgit:git-diff[1] pour contrôler la façon dont les modifications que chaque validation introduit sont affichées."
#. type: Labeled list
#: en/git-log.txt:30
@@ -31496,23 +31047,13 @@ msgstr "MISE EN FORME DIFF"
#: en/git-log.txt:122
#, 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."
+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:129
#, priority:260
msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never 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 merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)."
-msgstr ""
-"Notez que sauf si une des options `-c`, `--cc`, ou `-m` est donnée, 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 l'utilisation de `--first-parent`, pour "
-"laquelle les fusions sont traités comme des commits normaux à un seul parent "
-"(ceci peut être modifié en donnant une option de diff combiné ou avec `--no-"
-"diff-merges`)."
+msgstr "Notez que sauf si une des options `-c`, `--cc`, ou `-m` est donnée, 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 l'utilisation de `--first-parent`, pour laquelle les fusions sont traités comme des commits normaux à un seul parent (ceci peut être modifié en donnant une option de diff combiné ou avec `--no-diff-merges`)."
#. type: Plain text
#: en/git-log.txt:136
@@ -31548,9 +31089,7 @@ msgstr "--no-diff-merges"
#: en/git-log.txt:162
#, priority:260
msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`."
-msgstr ""
-"Désactive la sortie des diffs pour des commits de fusion (par défaut). Utile "
-"pour passer outre `-m`, `-c`, ou `--cc`."
+msgstr "Désactive la sortie des diffs pour des commits de fusion (par défaut). Utile pour passer outre `-m`, `-c`, ou `--cc`."
#. type: Labeled list
#: en/git-log.txt:170
@@ -37015,30 +36554,19 @@ msgstr "Une option de débogage pour aider au développement futur de \"clones p
#: en/git-pack-objects.txt:276
#, priority:100
msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. If the repository is a partial clone, an attempt to fetch missing objects will be made before declaring them missing. This is the default action."
-msgstr ""
-"La forme '--missing=error' demande que pack-objects s'arrête avec une erreur "
-"si un objet manquant est rencontré. Si le référentiel est un clone partiel, "
-"une tentative de récupération des objets manquants sera effectuée avant de "
-"les déclarer manquants. C'est l'action par défaut."
+msgstr "La forme '--missing=error' demande que pack-objects s'arrête avec une erreur si un objet manquant est rencontré. Si le référentiel est un clone partiel, une tentative de récupération des objets manquants sera effectuée avant de les déclarer manquants. C'est l'action par défaut."
#. type: Plain text
#: en/git-pack-objects.txt:280
#, priority:100
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. No fetch of a missing object will occur. Missing objects will silently be omitted from the results."
-msgstr ""
-"La forme '--missing=allow-any' permet de continuer le parcours d'objet si un "
-"objet manquant est rencontré. Il n'y aura pas de récupération d'un objet "
-"manquant. Les objets manquants seront silencieusement omis des résultats."
+msgstr "La forme '--missing=allow-any' permet de continuer le parcours d'objet si un objet manquant est rencontré. Il n'y aura pas de récupération d'un objet manquant. Les objets manquants seront silencieusement omis des résultats."
#. type: Plain text
#: en/git-pack-objects.txt:285
#, priority:100
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. No fetch of a missing object will occur. An unexpected missing object will raise an error."
-msgstr ""
-"Le forme '--missing=allow-promisor' est comme 'allow-any', mais ne permettra "
-"la traversée d'objets de continuer que pour les objets manquants du "
-"promettant EXPECTED. Il n'y aura pas de récupération d'un objet manquant. "
-"Les objets manquants inattendus entraîneront une erreur."
+msgstr "Le forme '--missing=allow-promisor' est comme 'allow-any', mais ne permettra la traversée d'objets de continuer que pour les objets manquants du promettant EXPECTED. Il n'y aura pas de récupération d'un objet manquant. Les objets manquants inattendus entraîneront une erreur."
#. type: Labeled list
#: en/git-pack-objects.txt:286 en/rev-list-options.txt:941
@@ -40284,10 +39812,7 @@ msgstr ""
#: en/git-rebase.txt:489
#, priority:100
msgid "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies `--force-rebase`."
-msgstr ""
-"Au lieu d'utiliser la date actuelle comme date de validateur, utilisez la "
-"date de l'auteur du commit comme date de validateur. Cette option implique "
-"`--force-rebase`."
+msgstr "Au lieu d'utiliser la date actuelle comme date de validateur, utilisez la date de l'auteur du commit comme date de validateur. Cette option implique `--force-rebase`."
#. type: Labeled list
#: en/git-rebase.txt:491
@@ -40625,283 +40150,163 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point et --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "Git Commits"
+msgid "Empty commits"
+msgstr "Commits Git"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
-#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:775
+#, fuzzy, no-wrap, priority:100
+#| msgid "Commit Ordering"
+msgid "Commit Rewording"
+msgstr "Ordre des commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -42633,8 +42038,7 @@ msgid ""
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <nom> <url>\n"
+"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nom> <url>\n"
"'git remote renom' <ancien> <nouveau>\n"
"'git remote remove' <nom>\n"
"'git remote set-head' <nom> (-a | --auto | -d | --delete | <branche>)\n"
@@ -42645,8 +42049,7 @@ msgstr ""
"'git remote set-url --delete' [--push] <nom> <url>\n"
"'git remote' [-v | --verbose] 'show' [-n] <nom>...\n"
"'git remote prune' [-n | --dry-run] <nom>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | "
-"<distant>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | <distant>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
@@ -42658,9 +42061,7 @@ msgstr "Gère un ensemble de dépôts (« distants ») dont vous suivez les bra
#: en/git-remote.txt:39
#, priority:220
msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
-msgstr ""
-"Être un peu plus verbeux et montrer les urls distantes après les noms. NOTE :"
-" cette option doit être placée entre `remote` et la sous-commande."
+msgstr "Être un peu plus verbeux et montrer les urls distantes après les noms. NOTE : cette option doit être placée entre `remote` et la sous-commande."
#. type: Plain text
#: en/git-remote.txt:46
@@ -42678,10 +42079,7 @@ msgstr "'add'"
#: en/git-remote.txt:52
#, priority:220
msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgstr ""
-"Ajouter un distant nommé <nom> pour le dépôt à <url>. La commande `git "
-"fetch <nom>` peut alors être utilisée pour créer et mettre à jour les "
-"branches de suivi à distance <nom>/<branche>."
+msgstr "Ajouter un distant nommé <nom> pour le dépôt à <url>. La commande `git fetch <nom>` peut alors être utilisée pour créer et mettre à jour les branches de suivi à distance <nom>/<branche>."
#. type: Plain text
#: en/git-remote.txt:55
@@ -42789,24 +42187,13 @@ msgstr "Avec `-d` ou `--delete`, la référence symbolique `refs/remotes/<nom>/H
#: en/git-remote.txt:116
#, priority:220
msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
-msgstr ""
-"Avec `-a` ou `--auto`, le distant est interrogé pour déterminer son `HEAD`, "
-"puis la référence symbolique `refs/remotes/<nom>/HEAD` est définie sur la "
-"même branche. Par exemple, si le distant `HEAD` est pointé sur `next`, `git "
-"remote set-head origin -a` définira la référence symbolique `refs/remotes/"
-"origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `"
-"refs/remotes/origin/next` existe déjà ; sinon, il faut d'abord la récupérer."
+msgstr "Avec `-a` ou `--auto`, le distant est interrogé pour déterminer son `HEAD`, puis la référence symbolique `refs/remotes/<nom>/HEAD` est définie sur la même branche. Par exemple, si le distant `HEAD` est pointé sur `next`, `git remote set-head origin -a` définira la référence symbolique `refs/remotes/origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `refs/remotes/origin/next` existe déjà ; sinon, il faut d'abord la récupérer."
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
-msgstr ""
-"Utiliser `<branche>` pour définir la référence symbolique `refs/remotes/"
-"<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` "
-"définira la référence symbolique `refs/remotes/origin/HEAD` à `refs/remotes/"
-"origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` "
-"existe déjà ; sinon, il faut d'abord le récupérer."
+msgstr "Utiliser `<branche>` pour définir la référence symbolique `refs/remotes/<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` définira la référence symbolique `refs/remotes/origin/HEAD` à `refs/remotes/origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` existe déjà ; sinon, il faut d'abord le récupérer."
#. type: Labeled list
#: en/git-remote.txt:123
@@ -42824,9 +42211,7 @@ msgstr "Modifier la liste des branches suivies par le distant nommé. Cela peut
#: en/git-remote.txt:131
#, priority:220
msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
-msgstr ""
-"Les branches nommées seront interprétées comme si elles étaient spécifiées "
-"avec l'option `-t` sur la ligne de commande `git remote add`."
+msgstr "Les branches nommées seront interprétées comme si elles étaient spécifiées avec l'option `-t` sur la ligne de commande `git remote add`."
#. type: Plain text
#: en/git-remote.txt:134
@@ -42934,9 +42319,7 @@ msgstr "Voir la section ÉLAGAGE de linkgit:git-fetch[1] pour savoir ce qui sera
#: en/git-remote.txt:186
#, priority:220
msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
-msgstr ""
-"Avec l'option `--dry-run`, signaler les branches qui seraient élaguées, mais "
-"ne pas réellement les élaguer."
+msgstr "Avec l'option `--dry-run`, signaler les branches qui seraient élaguées, mais ne pas réellement les élaguer."
#. type: Labeled list
#: en/git-remote.txt:187
@@ -42948,14 +42331,7 @@ msgstr "'update'"
#: en/git-remote.txt:195
#, priority:220
msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter `remote.<name>.skipDefaultUpdate` set to true will be updated. (See linkgit:git-config[1])."
-msgstr ""
-"Récupérer les mises à jour pour les distants ou les groupes de distants dans "
-"le dépôt comme défini par `remotes.<groupe>`. Si aucun groupe ni aucun "
-"distant n'est spécifié sur la ligne de commande, le paramètre de "
-"configuration `remotes.default` sera utilisé ; si `remotes.default` n'est "
-"pas défini, tous les distants dont le paramètre de configuration "
-"`remote.<nom>.skipDefaultUpdate` n'est pas défini à true seront mis à jour. "
-"(Voir linkgit:git-config[1])."
+msgstr "Récupérer les mises à jour pour les distants ou les groupes de distants dans le dépôt comme défini par `remotes.<groupe>`. Si aucun groupe ni aucun distant n'est spécifié sur la ligne de commande, le paramètre de configuration `remotes.default` sera utilisé ; si `remotes.default` n'est pas défini, tous les distants dont le paramètre de configuration `remote.<nom>.skipDefaultUpdate` n'est pas défini à true seront mis à jour. (Voir linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:197
@@ -47817,9 +47193,7 @@ msgstr "--group=<type>"
#: en/git-shortlog.txt:53
#, priority:260
msgid "Group commits based on `<type>`. If no `--group` option is specified, the default is `author`. `<type>` is one of:"
-msgstr ""
-"Grouper les commits basés sur `<type>`. Si aucune option `--group` n'est "
-"spécifiée, la valeur par défaut est `author`. `<type>` peut être :"
+msgstr "Grouper les commits basés sur `<type>`. Si aucune option `--group` n'est spécifiée, la valeur par défaut est `author`. `<type>` peut être :"
#. type: Plain text
#: en/git-shortlog.txt:56
@@ -47831,50 +47205,31 @@ msgstr "`author`, les commits sont groupés par auteur"
#: en/git-shortlog.txt:57
#, priority:260
msgid "`committer`, commits are grouped by committer (the same as `-c`)"
-msgstr ""
-"`committer`, les commits sont groupés par validateur (équivalent à `-c`)"
+msgstr "`committer`, les commits sont groupés par validateur (équivalent à `-c`)"
#. type: Plain text
#: en/git-shortlog.txt:62
#, priority:260
msgid "`trailer:<field>`, the `<field>` is interpreted as a case-insensitive commit message trailer (see linkgit:git-interpret-trailers[1]). For example, if your project uses `Reviewed-by` trailers, you might want to see who has been reviewing with `git shortlog -ns --group=trailer:reviewed-by`."
-msgstr ""
-"`trailer:<field>`, Le champ `<field>` est interprété comme un message de fin "
-"de commit sans prise en compte de la casse (voir linkgit:git-interpret-"
-"trailers[1]). Par exemple, si votre projet utilise des fins de messages "
-"`Reviewed-by`, vous voulez sans doute voir qui a fait des revisions avec `"
-"git shortlog -ns --group=trailer:reviewed-by`."
+msgstr "`trailer:<field>`, Le champ `<field>` est interprété comme un message de fin de commit sans prise en compte de la casse (voir linkgit:git-interpret-trailers[1]). Par exemple, si votre projet utilise des fins de messages `Reviewed-by`, vous voulez sans doute voir qui a fait des revisions avec `git shortlog -ns --group=trailer:reviewed-by`."
#. type: Plain text
#: en/git-shortlog.txt:67
#, priority:260
msgid "Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit)."
-msgstr ""
-"Notez que les commits qui n'incluent pas de fin de message ne seront pas "
-"comptés. De la même façon, les commits avec plusieurs fins de message (par "
-"ex., plusieurs approbations) peuvent être comptés plus d'une fois (mais "
-"seulement une fois par valeur unique de fin de message sur ce commit)."
+msgstr "Notez que les commits qui n'incluent pas de fin de message ne seront pas comptés. De la même façon, les commits avec plusieurs fins de message (par ex., plusieurs approbations) peuvent être comptés plus d'une fois (mais seulement une fois par valeur unique de fin de message sur ce commit)."
#. type: Plain text
#: en/git-shortlog.txt:72
#, priority:260
msgid "Shortlog will attempt to parse each trailer value as a `name <email>` identity. If successful, the mailmap is applied and the email is omitted unless the `--email` option is specified. If the value cannot be parsed as an identity, it will be taken literally and completely."
-msgstr ""
-"Shortlog tentera d'analyser chaque valeur de fin de texte comme une identité "
-"\"nom <email>\". En cas de succès, la carte de courrier est appliquée et le "
-"courriel est omis à moins que l'option `--email` ne soit spécifiée. Si la "
-"valeur ne peut pas être analysée comme une identité, elle sera prise "
-"littéralement et complètement."
+msgstr "Shortlog tentera d'analyser chaque valeur de fin de texte comme une identité \"nom <email>\". En cas de succès, la carte de courrier est appliquée et le courriel est omis à moins que l'option `--email` ne soit spécifiée. Si la valeur ne peut pas être analysée comme une identité, elle sera prise littéralement et complètement."
#. type: Plain text
#: en/git-shortlog.txt:78
#, priority:260
msgid "If `--group` is specified multiple times, commits are counted under each value (but again, only once per unique value in that commit). For example, `git shortlog --group=author --group=trailer:co-authored-by` counts both authors and co-authors."
-msgstr ""
-"Si `--group` est spécifié plusieurs fois, les commit sont comptés sous "
-"chaque valeur (mais encore une fois, une seule fois par valeur unique dans "
-"ce commit). Par exemple, `git shortlog --group=author --group=trailer:co-"
-"authored-by` compte à la fois les auteurs et les co-auteurs."
+msgstr "Si `--group` est spécifié plusieurs fois, les commit sont comptés sous chaque valeur (mais encore une fois, une seule fois par valeur unique dans ce commit). Par exemple, `git shortlog --group=author --group=trailer:co-authored-by` compte à la fois les auteurs et les co-auteurs."
#. type: Labeled list
#: en/git-shortlog.txt:80
@@ -50528,17 +49883,12 @@ msgstr "Mettre à jour les sous-modules enregistrés pour qu'ils correspondent a
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr "le commit enregistré dans le superprojet sera"
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
-msgstr "extrait dans le sous-module avec une HEAD détachée.\n"
+#, fuzzy, priority:220
+#| msgid "the commit recorded in the superproject will be merged"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
+msgstr "le commit enregistré dans le superprojet sera fusionné"
#. type: Plain text
#: en/git-submodule.txt:156
@@ -50552,29 +49902,19 @@ msgstr "Si `--force` est spécifié, le sous-module sera extrait (en utilisant `
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr "la branche actuelle du sous-module sera rebasée"
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr "sur le commit enregistré dans le super-projet.\n"
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-#, priority:220
-msgid "the commit recorded in the superproject will be merged"
-msgstr "le commit enregistré dans le superprojet sera fusionné"
+#, fuzzy, priority:220
+#| msgid "the current branch of the submodule will be rebased"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
+msgstr "la branche actuelle du sous-module sera rebasée"
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
-msgstr "dans la branche actuelle du sous-module.\n"
+#, fuzzy, priority:220
+#| msgid "the commit recorded in the superproject will be merged"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
+msgstr "le commit enregistré dans le superprojet sera fusionné"
#. type: Plain text
#: en/git-submodule.txt:165
@@ -50588,20 +49928,15 @@ msgstr "Les procédures 'update' suivantes sont uniquement disponibles via la va
msgid "custom command"
msgstr "commande personnalisée"
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr "commande shell arbitraire qui prend un seul"
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, fuzzy, priority:220
+#| msgid ""
+#| "argument (the sha1 of the commit recorded in the\n"
+#| "superproject) is executed. When `submodule.<name>.update`\n"
+#| "is set to '!command', the remainder after the exclamation mark\n"
+#| "is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
"argument (le sha1 du commit enregistré dans le\n"
"superprojet) est exécuté. Lorsque `submodule.<nom>.update`\n"
@@ -50642,11 +49977,7 @@ msgstr "set-branch (-d|--default) [--] <chemin>"
#: en/git-submodule.txt:187
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
-msgstr ""
-"Définir la branche distante par défaut pour le sous-module. L'option "
-"`--branch` permet de spécifier la branche distante. L'option `--default` "
-"supprime la clé de configuration submodule.<nom>.branch, ce qui fait que la "
-"branche de suivi par défaut est la branche 'HEAD' distante ."
+msgstr "Définir la branche distante par défaut pour le sous-module. L'option `--branch` permet de spécifier la branche distante. L'option `--default` supprime la clé de configuration submodule.<nom>.branch, ce qui fait que la branche de suivi par défaut est la branche 'HEAD' distante ."
#. type: Labeled list
#: en/git-submodule.txt:188
@@ -50778,13 +50109,7 @@ msgstr "-b <branche>"
#: en/git-submodule.txt:288
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to the remote 'HEAD'."
-msgstr ""
-"Branche du dépôt à ajouter comme sous-module. Le nom de la branche est "
-"enregistré comme `submodule.<nom>.branch` dans `.gitmodules` pour `update--"
-"remote`. Une valeur spéciale de `.` est utilisée pour indiquer que le nom "
-"de la branche dans le sous-module doit être le même que celui de la branche "
-"active dans le dépôt actuel. Si l'option n'est pas spécifiée, la valeur par "
-"défaut est `HEAD` distant."
+msgstr "Branche du dépôt à ajouter comme sous-module. Le nom de la branche est enregistré comme `submodule.<nom>.branch` dans `.gitmodules` pour `update--remote`. Une valeur spéciale de `.` est utilisée pour indiquer que le nom de la branche dans le sous-module doit être le même que celui de la branche active dans le dépôt actuel. Si l'option n'est pas spécifiée, la valeur par défaut est `HEAD` distant."
#. type: Plain text
#: en/git-submodule.txt:301
@@ -50832,52 +50157,25 @@ msgstr "--remote"
#: en/git-submodule.txt:329
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
-msgstr ""
-"Cette option n'est valable que pour la commande de mise à jour. Au lieu "
-"d'utiliser le SHA-1 enregistrée du superprojet pour mettre à jour le sous-"
-"module, utiliser le statut de la branche de suivi à distance du sous-"
-"module. Le distant utilisé est le distant de la branche (`branch.<nom>."
-"remote`), dont la valeur par défaut est `origin`. La branche distante "
-"utilisée est par défaut la branche distante `HEAD`, mais le nom de la "
-"branche peut être remplacé par l'option `submodule.<nom>.branch` dans `."
-"gitmodules` ou `.git/config` (avec `.git/config` en priorité)."
+msgstr "Cette option n'est valable que pour la commande de mise à jour. Au lieu d'utiliser le SHA-1 enregistrée du superprojet pour mettre à jour le sous-module, utiliser le statut de la branche de suivi à distance du sous-module. Le distant utilisé est le distant de la branche (`branch.<nom>.remote`), dont la valeur par défaut est `origin`. La branche distante utilisée est par défaut la branche distante `HEAD`, mais le nom de la branche peut être remplacé par l'option `submodule.<nom>.branch` dans `.gitmodules` ou `.git/config` (avec `.git/config` en priorité)."
#. type: Plain text
#: en/git-submodule.txt:335
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
-msgstr ""
-"Cela fonctionne pour toutes les procédures de mise à jour prises en charge "
-"(`--checkout`, `--rebase`, etc.). Le seul changement est la source de la "
-"cible SHA-1. Par exemple, `submodule update --remote --merge` fusionnera "
-"les changements de sous-module en amont dans les sous-modules, tandis que `"
-"submodule update --merge` fusionnera les changements du superprojet de "
-"gitlink dans les sous-modules."
+msgstr "Cela fonctionne pour toutes les procédures de mise à jour prises en charge (`--checkout`, `--rebase`, etc.). Le seul changement est la source de la cible SHA-1. Par exemple, `submodule update --remote --merge` fusionnera les changements de sous-module en amont dans les sous-modules, tandis que `submodule update --merge` fusionnera les changements du superprojet de gitlink dans les sous-modules."
#. type: Plain text
#: en/git-submodule.txt:340
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
-msgstr ""
-"Afin d'assurer un état actuel de la branche de suivi, `update --remote` va "
-"chercher le dépôt distant du sous-module avant de calculer le SHA-1. Si "
-"vous ne voulez pas récupérer, vous devez utiliser `submodule update --remote "
-"--no-fetch`."
+msgstr "Afin d'assurer un état actuel de la branche de suivi, `update --remote` va chercher le dépôt distant du sous-module avant de calculer le SHA-1. Si vous ne voulez pas récupérer, vous devez utiliser `submodule update --remote --no-fetch`."
#. type: Plain text
#: en/git-submodule.txt:350
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
-msgstr ""
-"Utiliser cette option pour intégrer les changements du sous-projet en amont "
-"dans la tête actuelle de votre sous-module. Alternativement, vous pouvez "
-"lancer `git pull` depuis le sous-module, qui est équivalent à l'exception du "
-"nom de la branche distante : `update --remote` utilise le dépôt amont par "
-"défaut et `submodule.<nom>.branch`, alors que `git pull` utilise le "
-"`branch.<nom>.merge` du sous-module. Préférez `submodule.<nom>.branch` si "
-"vous voulez distribuer la branche amont par défaut avec le superprojet et "
-"`branch.<nom>.merge` si vous voulez un aspect plus natif tout en travaillant "
-"dans le sous-module lui-même."
+msgstr "Utiliser cette option pour intégrer les changements du sous-projet en amont dans la tête actuelle de votre sous-module. Alternativement, vous pouvez lancer `git pull` depuis le sous-module, qui est équivalent à l'exception du nom de la branche distante : `update --remote` utilise le dépôt amont par défaut et `submodule.<nom>.branch`, alors que `git pull` utilise le `branch.<nom>.merge` du sous-module. Préférez `submodule.<nom>.branch` si vous voulez distribuer la branche amont par défaut avec le superprojet et `branch.<nom>.merge` si vous voulez un aspect plus natif tout en travaillant dans le sous-module lui-même."
#. type: Labeled list
#: en/git-submodule.txt:352
@@ -50889,9 +50187,7 @@ msgstr "--no-fetch"
#: en/git-submodule.txt:355
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Ne pas récupérer de "
-"nouveaux objets sur le site distant."
+msgstr "Cette option n'est valable que pour la commande update. Ne pas récupérer de nouveaux objets sur le site distant."
#. type: Labeled list
#: en/git-submodule.txt:356
@@ -50903,27 +50199,13 @@ msgstr "--checkout"
#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Vérifier le commit "
-"enregistré dans le superprojet sur une HEAD détachée dans le sous-module. "
-"C'est le comportement par défaut, l'utilisation principale de cette option "
-"est de remplacer `submodule.$nom.update` lorsqu'elle est définie à une "
-"valeur autre que `checkout`. Si la clé `submodule.$nom.update` n'est pas "
-"explicitement définie ou est définie à `checkout`, cette option est "
-"implicite."
+msgstr "Cette option n'est valable que pour la commande update. Vérifier le commit enregistré dans le superprojet sur une HEAD détachée dans le sous-module. C'est le comportement par défaut, l'utilisation principale de cette option est de remplacer `submodule.$nom.update` lorsqu'elle est définie à une valeur autre que `checkout`. Si la clé `submodule.$nom.update` n'est pas explicitement définie ou est définie à `checkout`, cette option est implicite."
#. type: Plain text
#: en/git-submodule.txt:374
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Fusionner le commit "
-"enregistré dans le superprojet dans la branche actuelle du sous-module. Si "
-"cette option est donnée, la HEAD du sous-module ne sera pas détachée. Si un "
-"échec de fusion empêche ce processus, vous devrez résoudre les conflits "
-"résultants au sein du sous-module avec les outils de résolution de conflits "
-"habituels. Si la clé `submodule.$nom.update` est définie sur `fusion`, "
-"cette option est implicite."
+msgstr "Cette option n'est valable que pour la commande update. Fusionner le commit enregistré dans le superprojet dans la branche actuelle du sous-module. Si cette option est donnée, la HEAD du sous-module ne sera pas détachée. Si un échec de fusion empêche ce processus, vous devrez résoudre les conflits résultants au sein du sous-module avec les outils de résolution de conflits habituels. Si la clé `submodule.$nom.update` est définie sur `fusion`, cette option est implicite."
#. type: Labeled list
#: en/git-submodule.txt:375
@@ -50935,13 +50217,7 @@ msgstr "--rebase"
#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
-msgstr ""
-"Cette option n'est valable que pour la commande de mise à jour. Rebaser la "
-"branche actuelle sur le commit enregistré dans le superprojet. Si cette "
-"option est donnée, la HEAD du sous-module ne sera pas détachée. Si un échec "
-"de fusion empêche ce processus, vous devrez résoudre ces échecs avec linkgit"
-":git-rebase[1]. Si la clé `submodule.$nom.update` est définie sur `rebase`, "
-"cette option est implicite."
+msgstr "Cette option n'est valable que pour la commande de mise à jour. Rebaser la branche actuelle sur le commit enregistré dans le superprojet. Si cette option est donnée, la HEAD du sous-module ne sera pas détachée. Si un échec de fusion empêche ce processus, vous devrez résoudre ces échecs avec linkgit:git-rebase[1]. Si la clé `submodule.$nom.update` est définie sur `rebase`, cette option est implicite."
#. type: Labeled list
#: en/git-submodule.txt:384
@@ -50953,10 +50229,7 @@ msgstr "--init"
#: en/git-submodule.txt:388
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Initialiser tous "
-"les sous-modules pour lesquels \"git submodule init\" n'a pas été appelé "
-"jusqu'à présent avant la mise à jour."
+msgstr "Cette option n'est valable que pour la commande update. Initialiser tous les sous-modules pour lesquels \"git submodule init\" n'a pas été appelé jusqu'à présent avant la mise à jour."
#. type: Labeled list
#: en/git-submodule.txt:389
@@ -50968,11 +50241,7 @@ msgstr "--name"
#: en/git-submodule.txt:393
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
-msgstr ""
-"Cette option n'est valable que pour la commande add. Elle fixe le nom du "
-"sous-module à la chaîne de caractères donnée au lieu de choisir par défaut "
-"son chemin d'accès. Le nom doit être valide en tant que nom de répertoire et "
-"ne peut pas se terminer par un \"/\"."
+msgstr "Cette option n'est valable que pour la commande add. Elle fixe le nom du sous-module à la chaîne de caractères donnée au lieu de choisir par défaut son chemin d'accès. Le nom doit être valide en tant que nom de répertoire et ne peut pas se terminer par un \"/\"."
#. type: Labeled list
#: en/git-submodule.txt:394
@@ -50984,10 +50253,7 @@ msgstr "--reference <dépôt>"
#: en/git-submodule.txt:398 en/git-submodule.txt:407
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
-msgstr ""
-"Cette option n'est valable que pour les commandes add et update. Ces "
-"commandes ont parfois besoin de cloner un dépôt distant. Dans ce cas, cette "
-"option sera passée à la commande linkgit:git-clone[1]."
+msgstr "Cette option n'est valable que pour les commandes add et update. Ces commandes ont parfois besoin de cloner un dépôt distant. Dans ce cas, cette option sera passée à la commande linkgit:git-clone[1]."
#. type: Plain text
#: en/git-submodule.txt:402
@@ -51011,12 +50277,7 @@ msgstr "*NOTE* : voir NOTE pour l'option `--reference`.\n"
#: en/git-submodule.txt:415
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
-msgstr ""
-"Cette option n'est valable que pour les commandes foreach, update, status et "
-"sync. Traverser les sous-modules de façon récursive. L'opération est "
-"effectuée non seulement dans les sous-modules du dépôt actuel, mais aussi "
-"dans tous les sous-modules imbriqués à l'intérieur de ces sous-modules (et "
-"ainsi de suite)."
+msgstr "Cette option n'est valable que pour les commandes foreach, update, status et sync. Traverser les sous-modules de façon récursive. L'opération est effectuée non seulement dans les sous-modules du dépôt actuel, mais aussi dans tous les sous-modules imbriqués à l'intérieur de ces sous-modules (et ainsi de suite)."
#. type: Labeled list
#: en/git-submodule.txt:416
@@ -51028,10 +50289,7 @@ msgstr "--depth"
#: en/git-submodule.txt:420
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
-msgstr ""
-"Cette option est valable pour les commandes d'ajout et de mise à jour. Créer "
-"un clone 'superficiel' avec un historique tronqué au nombre de révisions "
-"spécifié. Voir linkgit:git-clone[1]"
+msgstr "Cette option est valable pour les commandes d'ajout et de mise à jour. Créer un clone 'superficiel' avec un historique tronqué au nombre de révisions spécifié. Voir linkgit:git-clone[1]"
#. type: Labeled list
#: en/git-submodule.txt:421
@@ -51043,49 +50301,31 @@ msgstr "--[no-]recommend-shallow"
#: en/git-submodule.txt:426
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
-msgstr ""
-"Cette option n'est valable que pour la commande de mise à jour. Le clone "
-"initial d'un sous-module utilisera le `submodule.<nom>.shallow` recommandé, "
-"tel que fourni par le fichier `.gitmodules` par défaut. Pour ignorer les "
-"suggestions, utilisez `--no-recommend-shallow`."
+msgstr "Cette option n'est valable que pour la commande de mise à jour. Le clone initial d'un sous-module utilisera le `submodule.<nom>.shallow` recommandé, tel que fourni par le fichier `.gitmodules` par défaut. Pour ignorer les suggestions, utilisez `--no-recommend-shallow`."
#. type: Plain text
#: en/git-submodule.txt:432
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Cloner les nouveaux "
-"sous-modules en parallèle avec autant de tâches. L'option `submodule."
-"fetchJobs` est utilisée par défaut."
+msgstr "Cette option n'est valable que pour la commande update. Cloner les nouveaux sous-modules en parallèle avec autant de tâches. L'option `submodule.fetchJobs` est utilisée par défaut."
#. type: Plain text
#: en/git-submodule.txt:436
#, priority:220
msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
-msgstr ""
-"Cette option n'est valable que pour la commande update. Cloner une seule "
-"branche pendant la mise à jour : HEAD ou une branche spécifiée par --branch."
+msgstr "Cette option n'est valable que pour la commande update. Cloner une seule branche pendant la mise à jour : HEAD ou une branche spécifiée par --branch."
#. type: Plain text
#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
-msgstr ""
-"Chemins vers le(s) sous-module(s). Lorsque cela est spécifié, la commande ne "
-"fonctionnera que sur les sous-modules se trouvant sur les chemins "
-"spécifiés. (Cet argument est requis avec add)."
+msgstr "Chemins vers le(s) sous-module(s). Lorsque cela est spécifié, la commande ne fonctionnera que sur les sous-modules se trouvant sur les chemins spécifiés. (Cet argument est requis avec add)."
#. type: Plain text
#: en/git-submodule.txt:449
#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
-msgstr ""
-"Lors de l'initialisation des sous-modules, un fichier `.gitmodules` dans le "
-"répertoire de niveau supérieur du dépôt contenant est utilisé pour trouver "
-"l'url de chaque sous-module. Ce fichier doit être formaté de la même "
-"manière que le fichier `$GIT_DIR/config`. La clé de l'url de chaque sous-"
-"module est \"submodule.$nom.url\". Voir linkgit:gitmodules[5] pour plus de "
-"détails."
+msgstr "Lors de l'initialisation des sous-modules, un fichier `.gitmodules` dans le répertoire de niveau supérieur du dépôt contenant est utilisé pour trouver l'url de chaque sous-module. Ce fichier doit être formaté de la même manière que le fichier `$GIT_DIR/config`. La clé de l'url de chaque sous-module est \"submodule.$nom.url\". Voir linkgit:gitmodules[5] pour plus de détails."
#. type: Plain text
#: en/git-submodule.txt:453
@@ -53663,17 +52903,13 @@ msgstr "Ne répertorier que les étiquettes qui contiennent le commit spécifié
#: en/git-tag.txt:153
#, priority:240
msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
-"Ne lister que les étiquettes dont les commits sont accessibles à partir du "
-"commit spécifié (`HEAD` si non spécifié)."
+msgstr "Ne lister que les étiquettes dont les commits sont accessibles à partir du commit spécifié (`HEAD` si non spécifié)."
#. type: Plain text
#: en/git-tag.txt:157
#, priority:240
msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
-"Ne lister que les étiquettes dont les commits ne sont pas accessibles à "
-"partir du commit spécifié (`HEAD` si non spécifié)."
+msgstr "Ne lister que les étiquettes dont les commits ne sont pas accessibles à partir du commit spécifié (`HEAD` si non spécifié)."
#. type: Plain text
#: en/git-tag.txt:161
@@ -54974,16 +54210,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -55814,16 +55044,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -55922,16 +55146,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -55946,22 +55164,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -57874,8 +57080,7 @@ msgid ""
"'git worktree repair' [<path>...]\n"
"'git worktree unlock' <worktree>\n"
msgstr ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <nouvelle-"
-"branche>] <chemin> [<commit-esque>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <nouvelle-branche>] <chemin> [<commit-esque>]\n"
"'git worktree list' [--porcelain]\n"
"'git worktree lock' [--reason <chaîne>] <arbre-de-travail>\n"
"'git worktree move' <arbre-de-travail> <nouveau-chemin>\n"
@@ -57894,33 +57099,13 @@ msgstr "Gère plusieurs arbres de travail rattachés au même dépôt."
#: en/git-worktree.txt:34
#, priority:240
msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1]. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
-msgstr ""
-"Un dépôt git peut prendre en charge plusieurs arbres de travail, ce qui vous "
-"permet de consulter plus d'une branche à la fois. Avec `git worktree add`, "
-"un nouvel arbre de travail est associé au dépôt. Ce nouvel arbre de travail "
-"est appelé \"arbre de travail lié\" par opposition à l'\"arbre de travail "
-"principal\" préparé par linkgit:git-init[1] ou linkgit:git-clone[1]. Un "
-"dépôt a un arbre de travail principal (s'il ne s'agit pas d'un dépôt nu) et "
-"zéro ou plusieurs arbres de travail liés. Lorsque vous avez terminé avec un "
-"arbre de travail lié, supprimez-le avec `git worktree remove`."
+msgstr "Un dépôt git peut prendre en charge plusieurs arbres de travail, ce qui vous permet de consulter plus d'une branche à la fois. Avec `git worktree add`, un nouvel arbre de travail est associé au dépôt. Ce nouvel arbre de travail est appelé \"arbre de travail lié\" par opposition à l'\"arbre de travail principal\" préparé par linkgit:git-init[1] ou linkgit:git-clone[1]. Un dépôt a un arbre de travail principal (s'il ne s'agit pas d'un dépôt nu) et zéro ou plusieurs arbres de travail liés. Lorsque vous avez terminé avec un arbre de travail lié, supprimez-le avec `git worktree remove`."
#. type: Plain text
#: en/git-worktree.txt:46
#, priority:240
msgid "In its simplest form, `git worktree add <path>` automatically creates a new branch whose name is the final component of `<path>`, which is convenient if you plan to work on a new topic. For instance, `git worktree add ../hotfix` creates new branch `hotfix` and checks it out at path `../hotfix`. To instead work on an existing branch in a new working tree, use `git worktree add <path> <branch>`. On the other hand, if you just plan to make some experimental changes or do testing without disturbing existing development, it is often convenient to create a 'throwaway' working tree not associated with any branch. For instance, `git worktree add -d <path>` creates a new working tree with a detached `HEAD` at the same commit as the current branch."
-msgstr ""
-"Dans sa forme la plus simple, `git worktree add <chemin>` crée "
-"automatiquement une nouvelle branche dont le nom est le composant final de "
-"`<chemin>`, ce qui est pratique si vous prévoyez de travailler sur un "
-"nouveau sujet. Par exemple, `git worktree add ../hotfix` crée une nouvelle "
-"branche `hotfix` et l'extrait dans le chemin `../hotfix`. Pour travailler "
-"sur une branche existante dans un nouvel arbre de travail, utilisez `git "
-"worktree add <chemin> <branche>`. D'autre part, si vous prévoyez juste de "
-"faire quelques modifications expérimentales ou de faire des tests sans "
-"perturber le développement existant, il est souvent pratique de créer un "
-"arbre de travail « jetable » qui n'est associé à aucune branche. Par "
-"exemple, `git worktree add -d <chemin>` crée un nouvel arbre de travail avec "
-"une `HEAD` détachée au même commit que la branche courante."
+msgstr "Dans sa forme la plus simple, `git worktree add <chemin>` crée automatiquement une nouvelle branche dont le nom est le composant final de `<chemin>`, ce qui est pratique si vous prévoyez de travailler sur un nouveau sujet. Par exemple, `git worktree add ../hotfix` crée une nouvelle branche `hotfix` et l'extrait dans le chemin `../hotfix`. Pour travailler sur une branche existante dans un nouvel arbre de travail, utilisez `git worktree add <chemin> <branche>`. D'autre part, si vous prévoyez juste de faire quelques modifications expérimentales ou de faire des tests sans perturber le développement existant, il est souvent pratique de créer un arbre de travail « jetable » qui n'est associé à aucune branche. Par exemple, `git worktree add -d <chemin>` crée un nouvel arbre de travail avec une `HEAD` détachée au même commit que la branche courante."
#. type: Plain text
#: en/git-worktree.txt:53
@@ -57944,22 +57129,13 @@ msgstr "ajouter <chemin> [<commit-esque>]"
#: en/git-worktree.txt:67
#, priority:240
msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may be a bare \"`-`\", which is synonymous with `@{-1}`."
-msgstr ""
-"Créer `<chemin>` et valider `<commit-esque>` dans celui-ci. Le nouveau "
-"répertoire de travail est lié au dépôt actuel, partageant tout sauf les "
-"fichiers spécifiques au répertoire de travail tels que `HEAD`, `index`, etc. "
-"Pour plus de commodité, `<commit-esque>` peut être un simple \"`-`\", qui "
-"est synonyme de `@{-1}`."
+msgstr "Créer `<chemin>` et valider `<commit-esque>` dans celui-ci. Le nouveau répertoire de travail est lié au dépôt actuel, partageant tout sauf les fichiers spécifiques au répertoire de travail tels que `HEAD`, `index`, etc. Pour plus de commodité, `<commit-esque>` peut être un simple \"`-`\", qui est synonyme de `@{-1}`."
#. type: Plain text
#: en/git-worktree.txt:72
#, priority:240
msgid "If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
-msgstr ""
-"Si le `<commit-esque>` est un nom de branche (appelons-le '<branche>') et "
-"n'est pas trouvé, et ni '-b' ni '-B' ni '--detach' ne sont utilisés, mais "
-"qu'il existe une branche de suivi dans exactement un dépôt distant (appelons-"
-"le '<distant>') avec un nom correspondant, le traiter comme équivalent à :"
+msgstr "Si le `<commit-esque>` est un nom de branche (appelons-le '<branche>') et n'est pas trouvé, et ni '-b' ni '-B' ni '--detach' ne sont utilisés, mais qu'il existe une branche de suivi dans exactement un dépôt distant (appelons-le '<distant>') avec un nom correspondant, le traiter comme équivalent à :"
#. type: delimited block -
#: en/git-worktree.txt:75
@@ -57971,38 +57147,19 @@ msgstr "$ git worktree add --track -b <branche> <chemin> <distant>/<branche>\n"
#: en/git-worktree.txt:85
#, priority:240
msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the `origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
-msgstr ""
-"Si la branche existe dans plus d'un distant et que l'un d'entre eux est la "
-"valeur de la variable de configuration `checkout.defaultRemote`, celui-ci "
-"sera utilisé pour désambiguïser, même si la <branche> n'est pas unique parmi "
-"tous les distants. Réglez la variable `checkout.defaultRemote=origin` par "
-"exemple pour extraire toujours les branches distantes depuis celle-ci si "
-"<branche> est ambigüe mais existe sur le distant `origin`. Voir aussi "
-"`checkout.defaultRemote` dans linkgit:git-config[1]."
+msgstr "Si la branche existe dans plus d'un distant et que l'un d'entre eux est la valeur de la variable de configuration `checkout.defaultRemote`, celui-ci sera utilisé pour désambiguïser, même si la <branche> n'est pas unique parmi tous les distants. Réglez la variable `checkout.defaultRemote=origin` par exemple pour extraire toujours les branches distantes depuis celle-ci si <branche> est ambigüe mais existe sur le distant `origin`. Voir aussi `checkout.defaultRemote` dans linkgit:git-config[1]."
#. type: Plain text
#: en/git-worktree.txt:94
#, priority:240
msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new working tree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new working tree, if it's not checked out anywhere else, otherwise the command will refuse to create the working tree (unless `--force` is used)."
-msgstr ""
-"Si `<commit-esque>` est omis et que ni `-b` ni `-B` ni `--detach` ne sont "
-"utilisés, alors, par commodité, le nouvel arbre de travail est associé à une "
-"branche (appelez-la `<branche>`) nommée d'après `$(basename <chemin>)`. Si "
-"`<branche>` n'existe pas, une nouvelle branche basée sur `HEAD` est "
-"automatiquement créée comme si `-b <branche>` était donné. Si `<branche>` "
-"existe, elle sera extraite dans le nouvel arbre de travail, si elle n'est "
-"pas extraite ailleurs, sinon la commande refusera de créer l'arbre de "
-"travail (à moins que `--force` soit utilisé)."
+msgstr "Si `<commit-esque>` est omis et que ni `-b` ni `-B` ni `--detach` ne sont utilisés, alors, par commodité, le nouvel arbre de travail est associé à une branche (appelez-la `<branche>`) nommée d'après `$(basename <chemin>)`. Si `<branche>` n'existe pas, une nouvelle branche basée sur `HEAD` est automatiquement créée comme si `-b <branche>` était donné. Si `<branche>` existe, elle sera extraite dans le nouvel arbre de travail, si elle n'est pas extraite ailleurs, sinon la commande refusera de créer l'arbre de travail (à moins que `--force` soit utilisé)."
#. type: Plain text
#: en/git-worktree.txt:101
#, priority:240
msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, and the branch currently checked out (or \"detached HEAD\" if none)."
-msgstr ""
-"Lister les détails de chaque arbre de travail. L'arbre de travail principal "
-"est listé en premier, suivi de chacun des arbres de travail liés. Les "
-"détails de sortie comprennent si l'arbre de travail est vide, la révision en "
-"cours et la branche en cours (ou « HEAD détachée » s'il n'y en a pas)."
+msgstr "Lister les détails de chaque arbre de travail. L'arbre de travail principal est listé en premier, suivi de chacun des arbres de travail liés. Les détails de sortie comprennent si l'arbre de travail est vide, la révision en cours et la branche en cours (ou « HEAD détachée » s'il n'y en a pas)."
#. type: Labeled list
#: en/git-worktree.txt:102
@@ -58026,19 +57183,13 @@ msgstr "move"
#: en/git-worktree.txt:117
#, priority:240
msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked working trees if you move the main working tree manually.)"
-msgstr ""
-"Déplacer un arbre de travail vers une nouvelle place. Notez que l'arbre de "
-"travail principal ou les arbres de travail liés contenant des sous-modules "
-"ne peuvent pas être déplacés avec cette commande. (La commande `get worktree "
-"repair`, cependant peut rétablir la connexion avec les arbres de travail "
-"liées si vous déplacez l'arbre de travail principal.)"
+msgstr "Déplacer un arbre de travail vers une nouvelle place. Notez que l'arbre de travail principal ou les arbres de travail liés contenant des sous-modules ne peuvent pas être déplacés avec cette commande. (La commande `get worktree repair`, cependant peut rétablir la connexion avec les arbres de travail liées si vous déplacez l'arbre de travail principal.)"
#. type: Plain text
#: en/git-worktree.txt:121
#, priority:240
msgid "Prune working tree information in `$GIT_DIR/worktrees`."
-msgstr ""
-"Élaguer les informations de l'arbre de travail dans `$GIT_DIR/worktrees`."
+msgstr "Élaguer les informations de l'arbre de travail dans `$GIT_DIR/worktrees`."
#. type: Plain text
#: en/git-worktree.txt:128
@@ -58056,32 +57207,19 @@ msgstr "reparir [<chemin>...]"
#: en/git-worktree.txt:133
#, priority:240
msgid "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors."
-msgstr ""
-"Réparer les fichiers administratifs de l'arbre de travail, si possible, "
-"s'ils sont devenus corrompus ou obsolètes en raison de facteurs externes."
+msgstr "Réparer les fichiers administratifs de l'arbre de travail, si possible, s'ils sont devenus corrompus ou obsolètes en raison de facteurs externes."
#. type: Plain text
#: en/git-worktree.txt:138
#, priority:240
msgid "For instance, if the main working tree (or bare repository) is moved, linked working trees will be unable to locate it. Running `repair` in the main working tree will reestablish the connection from linked working trees back to the main working tree."
-msgstr ""
-"Par exemple, si l'arbre de travail principal (ou le dépôt nu) est déplacé, "
-"les arbres de travail liés seront incapables de le localiser. L'exécution de "
-"`repair` dans l'arbre de travail principal rétablira la connexion entre les "
-"arbres de travail liés et l'arbre de travail principal."
+msgstr "Par exemple, si l'arbre de travail principal (ou le dépôt nu) est déplacé, les arbres de travail liés seront incapables de le localiser. L'exécution de `repair` dans l'arbre de travail principal rétablira la connexion entre les arbres de travail liés et l'arbre de travail principal."
#. type: Plain text
#: en/git-worktree.txt:145
#, priority:240
msgid "Similarly, if a linked working tree is moved without using `git worktree move`, the main working tree (or bare repository) will be unable to locate it. Running `repair` within the recently-moved working tree will reestablish the connection. If multiple linked working trees are moved, running `repair` from any working tree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths."
-msgstr ""
-"De même, si un arbre de travail lié est déplacé sans utiliser `git worktree "
-"move`, l'arbre de travail principal (ou le dépôt nu) ne pourra pas le "
-"localiser. L'exécution de `repair` dans l'arbre de travail récemment déplacé "
-"rétablira la connexion. Si plusieurs arbres de travail liés sont déplacés, "
-"l'exécution de `repair` à partir de n'importe quel arbre de travail avec le "
-"nouveau `<chemin>` de chaque arbre comme argument, rétablira la connexion à "
-"tous les chemins spécifiés."
+msgstr "De même, si un arbre de travail lié est déplacé sans utiliser `git worktree move`, l'arbre de travail principal (ou le dépôt nu) ne pourra pas le localiser. L'exécution de `repair` dans l'arbre de travail récemment déplacé rétablira la connexion. Si plusieurs arbres de travail liés sont déplacés, l'exécution de `repair` à partir de n'importe quel arbre de travail avec le nouveau `<chemin>` de chaque arbre comme argument, rétablira la connexion à tous les chemins spécifiés."
#. type: Labeled list
#: en/git-worktree.txt:146
@@ -58105,13 +57243,7 @@ msgstr "Par défaut, `add` refuse de créer un nouvel arbre de travail lorsque `
#: en/git-worktree.txt:166
#, priority:240
msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
-msgstr ""
-"`move` refuse de déplacer un arbre de travail verrouillé à moins que "
-"`--force` ne soit spécifiée deux fois. Si la destination est déjà assignée à "
-"un autre arbre de travail mais est manquante (par exemple, si `<nouveau-"
-"chemin>` a été supprimé manuellement), alors `--force` permet au déplacement "
-"de continuer ; utilisez `--force` deux fois si la destination est "
-"verrouillée."
+msgstr "`move` refuse de déplacer un arbre de travail verrouillé à moins que `--force` ne soit spécifiée deux fois. Si la destination est déjà assignée à un autre arbre de travail mais est manquante (par exemple, si `<nouveau-chemin>` a été supprimé manuellement), alors `--force` permet au déplacement de continuer ; utilisez `--force` deux fois si la destination est verrouillée."
#. type: Plain text
#: en/git-worktree.txt:169
@@ -58135,21 +57267,13 @@ msgstr "-B <nouvelle-branche>"
#: en/git-worktree.txt:178
#, priority:240
msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
-msgstr ""
-"Avec `add`, créer une nouvelle branche nommée `<nouvelle-branche>` "
-"commençant à `<commit-esque>`, et extraire `<nouvelle-branche>` dans le "
-"nouvel arbre de travail. Si `<commit-esque>` est omis, la valeur par défaut "
-"est `HEAD`. Par défaut, `-b` refuse de créer une nouvelle branche si elle "
-"existe déjà. `-B` annule cette protection, en remettant `<nouvelle-branche>` "
-"à `<commit-esque>`."
+msgstr "Avec `add`, créer une nouvelle branche nommée `<nouvelle-branche>` commençant à `<commit-esque>`, et extraire `<nouvelle-branche>` dans le nouvel arbre de travail. Si `<commit-esque>` est omis, la valeur par défaut est `HEAD`. Par défaut, `-b` refuse de créer une nouvelle branche si elle existe déjà. `-B` annule cette protection, en remettant `<nouvelle-branche>` à `<commit-esque>`."
#. type: Plain text
#: en/git-worktree.txt:183
#, priority:240
msgid "With `add`, detach `HEAD` in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
-msgstr ""
-"Avec `add`, détacher `HEAD` dans le nouvel arbre de travail. Voir \"HEAD "
-"DÉTACHÉE\" dans linkgit:git-checkout[1]."
+msgstr "Avec `add`, détacher `HEAD` dans le nouvel arbre de travail. Voir \"HEAD DÉTACHÉE\" dans linkgit:git-checkout[1]."
#. type: Labeled list
#: en/git-worktree.txt:184
@@ -58173,12 +57297,7 @@ msgstr "--[no-]guess-remote"
#: en/git-worktree.txt:196
#, priority:240
msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
-msgstr ""
-"Avec `worktree add <chemin>`, sans `<commit-esque>`, au lieu de créer une "
-"nouvelle branche à partir de `HEAD`, s'il existe une branche de suivi "
-"d'exactement un distant correspondant au basename de `<chemin>`, baser la "
-"nouvelle branche sur la branche de suivi à distance, et marquer la branche "
-"de suivi à distance comme étant \"amont\" de la nouvelle branche."
+msgstr "Avec `worktree add <chemin>`, sans `<commit-esque>`, au lieu de créer une nouvelle branche à partir de `HEAD`, s'il existe une branche de suivi d'exactement un distant correspondant au basename de `<chemin>`, baser la nouvelle branche sur la branche de suivi à distance, et marquer la branche de suivi à distance comme étant \"amont\" de la nouvelle branche."
#. type: Plain text
#: en/git-worktree.txt:199
@@ -58196,11 +57315,7 @@ msgstr "--[no-]track"
#: en/git-worktree.txt:205
#, priority:240
msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details."
-msgstr ""
-"À la création d'une nouvelle branche, si `<commit-esque>`est une branche, la "
-"marquer comme « upstream » amont de la nouvelle branche. C'est la valeur par "
-"défaut si `<commit-esque>` est une branche de suivi à distance. Voir "
-"`--track` dans linkgit:git-branch[1] pour plus de détails."
+msgstr "À la création d'une nouvelle branche, si `<commit-esque>`est une branche, la marquer comme « upstream » amont de la nouvelle branche. C'est la valeur par défaut si `<commit-esque>` est une branche de suivi à distance. Voir `--track` dans linkgit:git-branch[1] pour plus de détails."
#. type: Labeled list
#: en/git-worktree.txt:206
@@ -58212,10 +57327,7 @@ msgstr "--lock"
#: en/git-worktree.txt:210
#, priority:240
msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition."
-msgstr ""
-"Garder l'arbre de travail verrouillé après la création. C'est l'équivalent "
-"de `git worktree lock` après `git worktree add`, mais sans condition de "
-"compétition."
+msgstr "Garder l'arbre de travail verrouillé après la création. C'est l'équivalent de `git worktree lock` après `git worktree add`, mais sans condition de compétition."
#. type: Plain text
#: en/git-worktree.txt:215
@@ -58245,9 +57357,7 @@ msgstr "Avec `prune`, signaler toutes les suppressions."
#: en/git-worktree.txt:231
#, priority:240
msgid "With `prune`, only expire unused working trees older than `<time>`."
-msgstr ""
-"Avec `prune`, n'expirer que les arbres de travail inutilisés plus vieux que "
-"`<temps>`."
+msgstr "Avec `prune`, n'expirer que les arbres de travail inutilisés plus vieux que `<temps>`."
#. type: Labeled list
#: en/git-worktree.txt:232
@@ -58277,12 +57387,7 @@ msgstr "Les arbres de travail peuvent être identifiés par leur chemin, qu'il s
#: en/git-worktree.txt:243
#, priority:240
msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify a working tree. For example if you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former working tree."
-msgstr ""
-"Si le dernier élément du chemin de l'arbre de travail est unique parmi les "
-"arbres de travail, il peut être utilisé pour identifier les arbres de "
-"travail. Par exemple, si vous n'avez que deux arbres de travail, à `/abc/def/"
-"ghi` et `/abc/def/ggg`, alors `ghi` ou `def/ghi` suffit à indiquer le "
-"premier arbre de travail."
+msgstr "Si le dernier élément du chemin de l'arbre de travail est unique parmi les arbres de travail, il peut être utilisé pour identifier les arbres de travail. Par exemple, si vous n'avez que deux arbres de travail, à `/abc/def/ghi` et `/abc/def/ggg`, alors `ghi` ou `def/ghi` suffit à indiquer le premier arbre de travail."
#. type: Title -
#: en/git-worktree.txt:245
@@ -58294,72 +57399,43 @@ msgstr "RÉFS"
#: en/git-worktree.txt:250
#, priority:240
msgid "In multiple working trees, some refs may be shared between all working trees and some refs are local. One example is `HEAD` which is different for each working tree. This section is about the sharing rules and how to access refs of one working tree from another."
-msgstr ""
-"Dans le cas de plusieurs arbres de travail, certaines réfs peuvent être "
-"partagées entre tous les arbres de travail et certaines réfs sont locales. "
-"Par exemple, `HEAD` est différente pour tous les arbres de travail. Cette "
-"section concerne les règles de partage et la manière d'accéder aux "
-"références d'un arbre de travail à partir d'un autre."
+msgstr "Dans le cas de plusieurs arbres de travail, certaines réfs peuvent être partagées entre tous les arbres de travail et certaines réfs sont locales. Par exemple, `HEAD` est différente pour tous les arbres de travail. Cette section concerne les règles de partage et la manière d'accéder aux références d'un arbre de travail à partir d'un autre."
#. type: Plain text
#: en/git-worktree.txt:256
#, priority:240
msgid "In general, all pseudo refs are per working tree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared."
-msgstr ""
-"En général, toutes les pseudo réfs sont par arbre de travail et toutes les "
-"réfs commençant par `refs/` sont partagées. Les pseudo réfs sont celles "
-"comme `HEAD` qui sont directement sous `$GIT_DIR` au lieu d'être à "
-"l'intérieur de `$GIT_DIR/refs`. Il y a cependant des exceptions à cela : les "
-"réfs à l'intérieur de `refs/bisect` et `refs/worktree` ne sont pas partagées."
+msgstr "En général, toutes les pseudo réfs sont par arbre de travail et toutes les réfs commençant par `refs/` sont partagées. Les pseudo réfs sont celles comme `HEAD` qui sont directement sous `$GIT_DIR` au lieu d'être à l'intérieur de `$GIT_DIR/refs`. Il y a cependant des exceptions à cela : les réfs à l'intérieur de `refs/bisect` et `refs/worktree` ne sont pas partagées."
#. type: Plain text
#: en/git-worktree.txt:261
#, priority:240
msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees."
-msgstr ""
-"Les références par arbre de travail sont toujours accessibles à partir d'un "
-"autre arbre de travail via deux chemins spéciaux, `main-worktree` et "
-"`worktrees`. Le premier donne accès aux références par arbre de travail de "
-"l'arbre de travail principal, tandis que le second donne accès à tous les "
-"arbres de travail liés."
+msgstr "Les références par arbre de travail sont toujours accessibles à partir d'un autre arbre de travail via deux chemins spéciaux, `main-worktree` et `worktrees`. Le premier donne accès aux références par arbre de travail de l'arbre de travail principal, tandis que le second donne accès à tous les arbres de travail liés."
#. type: Plain text
#: en/git-worktree.txt:268
#, priority:240
msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main working tree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
-msgstr ""
-"Par exemple, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` ont la "
-"même valeur que la `HEAD` de l'arbre de travail principal et `refs/bisect/"
-"good` respectivement. De même, `worktrees/foo/HEAD` ou `worktrees/bar/refs/"
-"bisect/bad` sont les mêmes que `$GIT_COMMON_DIR/worktrees/foo/HEAD` et `$"
-"GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
+msgstr "Par exemple, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` ont la même valeur que la `HEAD` de l'arbre de travail principal et `refs/bisect/good` respectivement. De même, `worktrees/foo/HEAD` ou `worktrees/bar/refs/bisect/bad` sont les mêmes que `$GIT_COMMON_DIR/worktrees/foo/HEAD` et `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
#. type: Plain text
#: en/git-worktree.txt:272
#, priority:240
msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
-msgstr ""
-"Pour accéder aux réfs, il est préférable de ne pas regarder directement dans "
-"`$GIT_DIR`. Utilisez plutôt des commandes telles que linkgit:git-rev-parse[1]"
-" ou linkgit:git-update-ref[1] qui gèreront les réfs correctement."
+msgstr "Pour accéder aux réfs, il est préférable de ne pas regarder directement dans `$GIT_DIR`. Utilisez plutôt des commandes telles que linkgit:git-rev-parse[1] ou linkgit:git-update-ref[1] qui gèreront les réfs correctement."
#. type: Plain text
#: en/git-worktree.txt:279
#, priority:240
msgid "By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
-msgstr ""
-"Par défaut, le fichier `config` du dépôt est partagé entre tous les arbres "
-"de travail. Si les variables de configuration `core.bare` ou `core.worktree` "
-"sont déjà présentes dans le fichier de configuration, elles ne seront "
-"appliquées qu'aux arbres de travail principaux."
+msgstr "Par défaut, le fichier `config` du dépôt est partagé entre tous les arbres de travail. Si les variables de configuration `core.bare` ou `core.worktree` sont déjà présentes dans le fichier de configuration, elles ne seront appliquées qu'aux arbres de travail principaux."
#. type: Plain text
#: en/git-worktree.txt:282
#, priority:240
msgid "In order to have configuration specific to working trees, you can turn on the `worktreeConfig` extension, e.g.:"
-msgstr ""
-"Afin d'avoir une configuration spécifique aux arbres de travail, vous pouvez "
-"activer l'extension `worktreeConfig`, par exemple :"
+msgstr "Afin d'avoir une configuration spécifique aux arbres de travail, vous pouvez activer l'extension `worktreeConfig`, par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:285
@@ -58377,12 +57453,7 @@ msgstr "Dans ce mode, la configuration spécifique reste dans le chemin indiqué
#: en/git-worktree.txt:297
#, priority:240
msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
-msgstr ""
-"Notez que dans ce fichier, l'exception pour `core.bare` et `core.worktree` a "
-"disparu. S'ils existent dans `$GIT_DIR/config`, vous devez les déplacer vers "
-"`config.worktree` de l'arbre de travail principal. Vous pouvez également "
-"profiter de cette occasion pour revoir et déplacer d'autres configurations "
-"que vous ne voulez pas partager dans tous les arbres de travail :"
+msgstr "Notez que dans ce fichier, l'exception pour `core.bare` et `core.worktree` a disparu. S'ils existent dans `$GIT_DIR/config`, vous devez les déplacer vers `config.worktree` de l'arbre de travail principal. Vous pouvez également profiter de cette occasion pour revoir et déplacer d'autres configurations que vous ne voulez pas partager dans tous les arbres de travail :"
#. type: Plain text
#: en/git-worktree.txt:299
@@ -58406,90 +57477,43 @@ msgstr "DÉTAILS"
#: en/git-worktree.txt:313
#, priority:240
msgid "Each linked working tree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
-msgstr ""
-"Chaque arbre de travail lié possède un sous-répertoire privé dans le "
-"répertoire `$ GIT_DIR/worktrees` du dépôt. Le nom du sous-répertoire privé "
-"est généralement le nom de base du chemin de l'arbre de travail lié, "
-"éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, "
-"lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /"
-"chemin/autre/test-prochain prochain` crée l'arbre de travail lié dans `/"
-"chemin/autre/test-prochain` et crée aussi un répertoire `$GIT_DIR/worktrees/"
-"test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est "
-"déjà pris)."
+msgstr "Chaque arbre de travail lié possède un sous-répertoire privé dans le répertoire `$ GIT_DIR/worktrees` du dépôt. Le nom du sous-répertoire privé est généralement le nom de base du chemin de l'arbre de travail lié, éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /chemin/autre/test-prochain prochain` crée l'arbre de travail lié dans `/chemin/autre/test-prochain` et crée aussi un répertoire `$GIT_DIR/worktrees/test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est déjà pris)."
#. type: Plain text
#: en/git-worktree.txt:319
#, priority:240
msgid "Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
-msgstr ""
-"Dans un arbre de travail lié, `$GIT_DIR` est défini pour pointer vers ce "
-"répertoire privé (par exemple, `/chemin/principal/.git/worktrees/test-"
-"prochain` dans l'exemple) et `$GIT_COMMON_DIR` est défini pour pointer vers "
-"l'arbre de travail principal. `$GIT_DIR` (par exemple `/chemin/principal/."
-"git`). Ces paramètres sont définis dans un fichier `.git` situé dans le "
-"répertoire supérieur de l'arbre de travail lié."
+msgstr "Dans un arbre de travail lié, `$GIT_DIR` est défini pour pointer vers ce répertoire privé (par exemple, `/chemin/principal/.git/worktrees/test-prochain` dans l'exemple) et `$GIT_COMMON_DIR` est défini pour pointer vers l'arbre de travail principal. `$GIT_DIR` (par exemple `/chemin/principal/.git`). Ces paramètres sont définis dans un fichier `.git` situé dans le répertoire supérieur de l'arbre de travail lié."
#. type: Plain text
#: en/git-worktree.txt:329
#, priority:240
msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except `refs/bisect` and `refs/worktree`."
-msgstr ""
-"La résolution du chemin via `git rev-parse --git-path` utilise soit "
-"`$GIT_DIR` soit `$GIT_COMMON_DIR` selon le chemin. Par exemple, dans l'arbre "
-"de travail lié `git rev-parse --git-path HEAD` renvoie `/chemin/principal/."
-"git/worktrees/test-prochain/HEAD` (pas `/chemin/autre/test-prochain/.git/"
-"HEAD` ou `/chemin/principal/.git/HEAD`) tandis que `git rev-parse --git-path "
-"refs/heads/master` utilise `$GIT_COMMON_DIR` et retourne `/chemin/principal/."
-"git/refs/heads/master`, puisque les réfs sont partagées sur tous les arbres "
-"de travail, sauf `refs/bisect` et `refs/worktree`."
+msgstr "La résolution du chemin via `git rev-parse --git-path` utilise soit `$GIT_DIR` soit `$GIT_COMMON_DIR` selon le chemin. Par exemple, dans l'arbre de travail lié `git rev-parse --git-path HEAD` renvoie `/chemin/principal/.git/worktrees/test-prochain/HEAD` (pas `/chemin/autre/test-prochain/.git/HEAD` ou `/chemin/principal/.git/HEAD`) tandis que `git rev-parse --git-path refs/heads/master` utilise `$GIT_COMMON_DIR` et retourne `/chemin/principal/.git/refs/heads/master`, puisque les réfs sont partagées sur tous les arbres de travail, sauf `refs/bisect` et `refs/worktree`."
#. type: Plain text
#: en/git-worktree.txt:334
#, priority:240
msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path."
-msgstr ""
-"Voir linkgit:gitrepository-layout[5] pour plus d'informations. La règle de "
-"base est de ne pas faire d'hypothèse sur l'appartenance d'un chemin à "
-"`$GIT_DIR` ou `$GIT_COMMON_DIR` lorsque vous devez accéder directement à "
-"quelque chose à l'intérieur de ``$GIT_DIR`. Utilisez `git rev-parse --git-"
-"path` pour obtenir le chemin final."
+msgstr "Voir linkgit:gitrepository-layout[5] pour plus d'informations. La règle de base est de ne pas faire d'hypothèse sur l'appartenance d'un chemin à `$GIT_DIR` ou `$GIT_COMMON_DIR` lorsque vous devez accéder directement à quelque chose à l'intérieur de ``$GIT_DIR`. Utilisez `git rev-parse --git-path` pour obtenir le chemin final."
#. type: Plain text
#: en/git-worktree.txt:342
#, priority:240
msgid "If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically."
-msgstr ""
-"Si vous déplacez manuellement un arbre de travail lié, vous devez mettre à "
-"jour le fichier `gitdir` dans le répertoire de l'entrée. Par exemple, si un "
-"arbre de travail lié est déplacé vers `/nouveau-chemin/test-prochain` et que "
-"son fichier` .git` pointe vers `/chemin/principal/.git /worktrees/test-"
-"prochain`, puis mettez à jour`/chemin/principal/.git/worktrees/test-prochain/"
-"gitdir` pour référencer `/nouveau-chemin/test-prochain` à la place. Mieux "
-"encore, exécutez `git worktree repair` pour rétablir automatiquement la "
-"connexion."
+msgstr "Si vous déplacez manuellement un arbre de travail lié, vous devez mettre à jour le fichier `gitdir` dans le répertoire de l'entrée. Par exemple, si un arbre de travail lié est déplacé vers `/nouveau-chemin/test-prochain` et que son fichier` .git` pointe vers `/chemin/principal/.git /worktrees/test-prochain`, puis mettez à jour`/chemin/principal/.git/worktrees/test-prochain/gitdir` pour référencer `/nouveau-chemin/test-prochain` à la place. Mieux encore, exécutez `git worktree repair` pour rétablir automatiquement la connexion."
#. type: Plain text
#: en/git-worktree.txt:353
#, priority:240
msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
-msgstr ""
-"Pour éviter qu'une entrée `$GIT_DIR/worktrees` ne soit élaguée (ce qui peut "
-"être utile dans certaines situations, comme lorsque l'arbre de travail de "
-"l'entrée est stocké sur un support amovible), utilisez la commande `git "
-"worktree lock`, qui ajoute un fichier nommé `locked` au répertoire de "
-"l'entrée. Le fichier contient le motif en texte clair. Par exemple, si le "
-"fichier `.git` d'un arbre de travail lié pointe vers `/chemin/principal/.git/"
-"worktrees/test-prochain`, alors un fichier nommé `/chemin/principal/.git/"
-"worktrees/test-prochain/locked` empêchera l'élagage de l'entrée `test-"
-"prochain`. Voir linkgit:gitrepository-layout[5] pour plus de détails."
+msgstr "Pour éviter qu'une entrée `$GIT_DIR/worktrees` ne soit élaguée (ce qui peut être utile dans certaines situations, comme lorsque l'arbre de travail de l'entrée est stocké sur un support amovible), utilisez la commande `git worktree lock`, qui ajoute un fichier nommé `locked` au répertoire de l'entrée. Le fichier contient le motif en texte clair. Par exemple, si le fichier `.git` d'un arbre de travail lié pointe vers `/chemin/principal/.git/worktrees/test-prochain`, alors un fichier nommé `/chemin/principal/.git/worktrees/test-prochain/locked` empêchera l'élagage de l'entrée `test-prochain`. Voir linkgit:gitrepository-layout[5] pour plus de détails."
#. type: Plain text
#: en/git-worktree.txt:356
#, priority:240
msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
-msgstr ""
-"Lorsque `extensions.worktreeConfig` est activé, le fichier de configuration `"
-".git/worktrees/<id>/config.worktree` est lu après `.git/config`."
+msgstr "Lorsque `extensions.worktreeConfig` est activé, le fichier de configuration `.git/worktrees/<id>/config.worktree` est lu après `.git/config`."
#. type: Title -
#: en/git-worktree.txt:358
@@ -58501,9 +57525,7 @@ msgstr "FORMAT DE SORTIE DE LA LISTE"
#: en/git-worktree.txt:361
#, priority:240
msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:"
-msgstr ""
-"La commande `worktree list` a deux formats de sortie. Le format par défaut "
-"affiche les détails sur une seule ligne avec des colonnes. Par exemple :"
+msgstr "La commande `worktree list` a deux formats de sortie. Le format par défaut affiche les détails sur une seule ligne avec des colonnes. Par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:367
@@ -58529,13 +57551,7 @@ msgstr "Format de la porcelaine"
#: en/git-worktree.txt:376
#, priority:240
msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. The first attribute of a working tree is always `worktree`, an empty line indicates the end of the record. For example:"
-msgstr ""
-"Le format de porcelaine comporte une ligne par attribut. Les attributs sont "
-"énumérés avec une étiquette et une valeur séparées par un seul espace. Les "
-"attributs booléens (comme `bare` et `detached`) sont énumérés sous forme "
-"d'étiquette uniquement, et ne sont présents que si la valeur est vraie. Le "
-"premier attribut d'un arbre de travail est toujours `worktree`, une ligne "
-"vide indique la fin de l'enregistrement. Par exemple :"
+msgstr "Le format de porcelaine comporte une ligne par attribut. Les attributs sont énumérés avec une étiquette et une valeur séparées par un seul espace. Les attributs booléens (comme `bare` et `detached`) sont énumérés sous forme d'étiquette uniquement, et ne sont présents que si la valeur est vraie. Le premier attribut d'un arbre de travail est toujours `worktree`, une ligne vide indique la fin de l'enregistrement. Par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:381
@@ -61145,16 +60161,11 @@ msgstr "réinitialise la couleur"
msgid "'%C(...)'"
msgstr "'%C(...)'"
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr "la spécification de la couleur, comme décrit sous Valeurs dans la section"
-
#. type: Plain text
#: en/pretty-formats.txt:146
-#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+#, fuzzy, ignore-ellipsis, priority:260
+#| msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr "section \"FICHIER DE CONFIGURATION\" de linkgit:git-config[1]. Par défaut, les couleurs ne sont affichées que lorsqu'elles sont activées pour la sortie des journaux (par `color.diff`, `color.ui`, ou `--color`, et en respectant les paramètres `auto` du premier si nous allons sur un terminal). `%C(auto,...)` est accepté comme synonyme historique de la valeur par défaut (par exemple, `%C(auto,red)`). Spécifier `%C(always,...)` affichera les couleurs même si la couleur n'est pas activée autrement (bien qu'il faille toujours utiliser `--color=always` pour activer la couleur pour toute la sortie, y compris ce format et tout ce que git peut colorier). `auto` seul (c'est-à-dire `%C(auto)`) activera la coloration automatique sur les places suivantes jusqu'à ce que la couleur soit à nouveau changée."
#. type: Labeled list
@@ -61175,17 +60186,12 @@ msgstr "marque à gauche (`<`), à droite (`>`) ou de limite (`-`)"
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr "'%w([<w>[,<i1>[,<i2>]]])'"
-#. type: Plain text
-#: en/pretty-formats.txt:148
-#, priority:260
-msgid "switch line wrapping, like the -w option of"
-msgstr "basculer les retours à la ligne, à l'instar de l'option-w de"
-
#. type: Plain text
#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy, priority:260
+#| msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "basculer les retours à la ligne, à l'instar de l'option-w de"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -61193,16 +60199,11 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr "'%<(<N>[,tronq|tronqg|tronqm])'"
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr "faire le prochain espace réservé prendre"
-
#. type: Plain text
#: en/pretty-formats.txt:157
-#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+#, fuzzy, priority:260
+#| msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr "au moins N colonnes, en remplissant les espaces à droite si nécessaire. Au choix, tronquer au début (tronqg), au milieu (tronqm) ou à la fin (tronq) si la sortie est plus longue que N colonnes. Notez que la troncation ne fonctionne correctement qu'avec N >= 2."
#. type: Labeled list
@@ -61211,17 +60212,12 @@ msgstr "au moins N colonnes, en remplissant les espaces à droite si nécessaire
msgid "'%<|(<N>)'"
msgstr "'%<|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr "faire le prochain espace réservé prendre au moins jusqu'au Nième"
-
#. type: Plain text
#: en/pretty-formats.txt:159
-#, priority:260
-msgid "columns, padding spaces on the right if necessary"
-msgstr "colonnes, en insérant des espaces à droite si nécessaire"
+#, fuzzy, priority:260
+#| msgid "make the next placeholder take at least until Nth"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
+msgstr "faire le prochain espace réservé prendre au moins jusqu'au Nième"
#. type: Labeled list
#: en/pretty-formats.txt:159
@@ -61229,17 +60225,12 @@ msgstr "colonnes, en insérant des espaces à droite si nécessaire"
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr "'%>(<N>)', '%>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr "similaire à '%<(<N>)', '%<|(<N>)' respectivement,"
-
#. type: Plain text
#: en/pretty-formats.txt:161
-#, priority:260
-msgid "but padding spaces on the left"
-msgstr "mais en insérant des espaces à gauche"
+#, fuzzy, priority:260
+#| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgstr "similaire à '%<(<N>)', '%<|(<N>)' respectivement,"
#. type: Labeled list
#: en/pretty-formats.txt:161
@@ -61247,16 +60238,11 @@ msgstr "mais en insérant des espaces à gauche"
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr "'%>>(<N>)', '%>>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr "similaire à '%>(<N>)', '%>|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:166
-#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+#, fuzzy, priority:260
+#| msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr "respectivement, sauf que si le prochain espace réservé prend plus d'espaces que prévu et qu'il y a des espaces à sa gauche, utiliser ces espaces"
#. type: Labeled list
@@ -61265,16 +60251,11 @@ msgstr "respectivement, sauf que si le prochain espace réservé prend plus d'es
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr "similaire à '%<(<N>)', '%<|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:169
-#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+#, fuzzy, priority:260
+#| msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr "respectivement, mais en calant des deux côtés (c'est-à-dire que le texte est centré)"
#. type: Plain text
@@ -61374,17 +60355,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:180
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "ou linkgit:git-blame[1])"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -61404,9 +60380,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
@@ -61428,16 +60405,11 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:186
@@ -61542,10 +60514,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr "nom du validateur (en respectant .mailmap, voir"
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -61566,10 +60539,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr "e-mail du validateur (en respectant .mailmap, voir"
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -61590,9 +60564,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "partie locale du validateur (voir '%cl') en respectant .mailmap, voir"
#. type: Labeled list
@@ -61703,17 +60678,12 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr "les noms des refs, sans encadrement par « ( » et « ) »."
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "nom de ref fourni en ligne de commande par lequel le commit a été atteint"
-
#. type: Plain text
#: en/pretty-formats.txt:213
-#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
-msgstr "(comme `git log --source`), ne fonctionne qu'avec `git log`"
+#, fuzzy, priority:260
+#| msgid "ref name given on the command line by which the commit was reached"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "nom de ref fourni en ligne de commande par lequel le commit a été atteint"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -61799,16 +60769,11 @@ msgstr "message de vérification brut de GPG pour un commit signé"
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr "afficher \"G\" pour une bonne signature (valide),"
-
#. type: Plain text
#: en/pretty-formats.txt:230
-#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+#, fuzzy, priority:260
+#| msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr "\"B\" pour une mauvaise signature, \"U\" pour une bonne signature avec une validité inconnue, \"X\" pour une bonne signature qui a expiré, \"Y\" pour une bonne signature faite par une clé expirée, \"R\" pour une bonne signature faite par une clé révoquée, \"E\" si la signature ne peut pas être vérifiée (par exemple la clé est manquante) et \"N\" pour aucune signature"
#. type: Labeled list
@@ -61853,17 +60818,12 @@ msgstr "afficher l'empreinte digitale de la clé utilisée pour signer un commit
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr "afficher l'empreinte digitale de la clé primaire dont la sous-clé a été utilisée"
-
#. type: Plain text
#: en/pretty-formats.txt:235
-#, priority:260
-msgid "to sign a signed commit"
-msgstr "pour signer un commit signé"
+#, fuzzy, priority:260
+#| msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgstr "afficher l'empreinte digitale de la clé primaire dont la sous-clé a été utilisée"
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -61883,16 +60843,11 @@ msgstr "afficher le niveau de rouille de la clé utilisée pour signer un commit
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr "sélecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
-
#. type: Plain text
#: en/pretty-formats.txt:241
-#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+#, fuzzy, priority:260
+#| msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "minutes ago}` ; le format suit les règles décrites pour l'option `-g'. La partie avant `@' est le refname tel qu'il est donné sur la ligne de commande (donc `git log -g refs/heads/master` produirait `refs/heads/master@{0}`)."
#. type: Labeled list
@@ -61901,16 +60856,11 @@ msgstr "minutes ago}` ; le format suit les règles décrites pour l'option `-g'.
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr "sélecteur de reflog raccourci ; identique à `%gD', mais la partie du nom du reflog"
-
#. type: Plain text
#: en/pretty-formats.txt:244
-#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+#, fuzzy, priority:260
+#| msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr "est raccourcie pour la lisibilité humaine (ainsi `refs/heads/master` devient simplement `master`)."
#. type: Labeled list
@@ -61932,10 +60882,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr "nom de l'identité du reflog (en respectant le fichier.mailmap, voir"
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nom de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -61956,10 +60907,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr "adresse de courriel de l'identité reflog (en respectant le fichier .mailmap, voir"
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail de l'auteur (en respectant .mailmap, voir linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -61979,16 +60931,11 @@ msgstr "titre du reflog"
msgid "'%(trailers[:options])'"
msgstr "'%(trailers[:options])'"
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr "afficher les lignes d'attribut du corps comme"
-
#. type: Plain text
#: en/pretty-formats.txt:256
-#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+#, fuzzy, priority:260
+#| msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr "interprétés par linkgit:git-interpret-trailers[1]. La chaîne `trailers` peut être suivie de deux-points et de zéro ou plus d'options séparées par des virgules :"
#. type: Plain text
@@ -62153,11 +61100,7 @@ msgstr "--no-abbrev-commit"
#: en/pretty-options.txt:30
#, priority:260
msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit`, either explicit or implied by other options such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
-msgstr ""
-"Afficher le nom complet hexadécimal de 40 octets de l'objet commit. Ceci "
-"annule `--abbrev-commit`, qu'elle soit explicitement ou implicitement "
-"impliquée par d'autres options telles que \"--online\". Elle remplace "
-"également la variable `log.abbrevCommit`."
+msgstr "Afficher le nom complet hexadécimal de 40 octets de l'objet commit. Ceci annule `--abbrev-commit`, qu'elle soit explicitement ou implicitement impliquée par d'autres options telles que \"--online\". Elle remplace également la variable `log.abbrevCommit`."
#. type: Plain text
#: en/pretty-options.txt:34
@@ -62317,32 +61260,13 @@ msgstr "Le format d'un paramètre <spéc-de-réf> est un plus `+` optionnel, sui
#: en/pull-fetch-param.txt:38
#, priority:220
msgid "A <refspec> may contain a `*` in its <src> to indicate a simple pattern match. Such a refspec functions like a glob that matches any ref with the same prefix. A pattern <refspec> must have a `*` in both the <src> and <dst>. It will map refs to the destination by replacing the `*` with the contents matched from the source."
-msgstr ""
-"Un <spec-de-réf> peut contenir un `*` dans son <src> pour indiquer une "
-"simple correspondance de motif. Un tel refspec fonctionne comme un motif qui "
-"correspond à n'importe quelle ref avec le même préfixe. Un motif <spec-de-"
-"réf> doit avoir un `*` dans les deux <src> et <dst>. Il va faire "
-"correspondre les références à la destination en remplaçant le `*` par le "
-"contenu correspondant de la source."
+msgstr "Un <spec-de-réf> peut contenir un `*` dans son <src> pour indiquer une simple correspondance de motif. Un tel refspec fonctionne comme un motif qui correspond à n'importe quelle ref avec le même préfixe. Un motif <spec-de-réf> doit avoir un `*` dans les deux <src> et <dst>. Il va faire correspondre les références à la destination en remplaçant le `*` par le contenu correspondant de la source."
#. type: Plain text
#: en/pull-fetch-param.txt:48
#, priority:220
msgid "If a refspec is prefixed by `^`, it will be interpreted as a negative refspec. Rather than specifying which refs to fetch or which local refs to update, such a refspec will instead specify refs to exclude. A ref will be considered to match if it matches at least one positive refspec, and does not match any negative refspec. Negative refspecs can be useful to restrict the scope of a pattern refspec so that it will not include specific refs. Negative refspecs can themselves be pattern refspecs. However, they may only contain a <src> and do not specify a <dst>. Fully spelled out hex object names are also not supported."
-msgstr ""
-"Si un spécificateur de référence est préfixé par `^`, il sera interprété "
-"comme un spécificateur de référence négatif. Plutôt que de spécifier les "
-"références à récupérer ou les références locales à mettre à jour, un tel "
-"spécificateur de référence spécifiera les références à exclure. Une "
-"référence sera considérée comme correspondante si elle correspond à au moins "
-"une référence positive, et ne correspond à aucune référence négative. Les "
-"spécificateurs de référence négatifs peuvent être utiles pour restreindre le "
-"champ d'application d'un spécificateur modèle de référence afin qu'il "
-"n'inclue pas de références spécifiques. Les spécificateurs de référence "
-"négatifs peuvent eux-mêmes être des spécificateurs modèles de référence . "
-"Cependant, ils ne peuvent contenir qu'un <src> et ne peuvent pas spécifier "
-"un <dst>. Les noms d'objets hexagonaux complets ne sont pas non plus pris en "
-"charge."
+msgstr "Si un spécificateur de référence est préfixé par `^`, il sera interprété comme un spécificateur de référence négatif. Plutôt que de spécifier les références à récupérer ou les références locales à mettre à jour, un tel spécificateur de référence spécifiera les références à exclure. Une référence sera considérée comme correspondante si elle correspond à au moins une référence positive, et ne correspond à aucune référence négative. Les spécificateurs de référence négatifs peuvent être utiles pour restreindre le champ d'application d'un spécificateur modèle de référence afin qu'il n'inclue pas de références spécifiques. Les spécificateurs de référence négatifs peuvent eux-mêmes être des spécificateurs modèles de référence . Cependant, ils ne peuvent contenir qu'un <src> et ne peuvent pas spécifier un <dst>. Les noms d'objets hexagonaux complets ne sont pas non plus pris en charge."
#. type: Plain text
#: en/pull-fetch-param.txt:51
@@ -62789,9 +61713,7 @@ msgstr ""
#: en/revisions.txt:259
#, priority:100
msgid "Specifying several revisions means the set of commits reachable from any of the given commits."
-msgstr ""
-"Spécifier plusieurs révisions signifie l'ensemble de commits accessibles à "
-"partir de l'un des commits donnés."
+msgstr "Spécifier plusieurs révisions signifie l'ensemble de commits accessibles à partir de l'un des commits donnés."
#. type: Plain text
#: en/revisions.txt:262
@@ -63305,13 +62227,7 @@ msgstr "`--no-min-parents` et `--no-max-parents` réinitialisent ces limites (à
#: en/rev-list-options.txt:132
#, priority:260
msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge."
-msgstr ""
-"Ne suivre que le premier commit parent lors d'un commit de fusion. Cette "
-"option peut donner une meilleure vue d'ensemble lors de l'affichage de "
-"l'évolution d'une branche de sujet particulière, parce que la fusion dans "
-"une branche de sujet a tendance à n'être que des mises à jour avec l'amont "
-"de temps en temps, et cette option permet d'ignorer les commits individuels "
-"apportés dans votre historique par de telles fusions."
+msgstr "Ne suivre que le premier commit parent lors d'un commit de fusion. Cette option peut donner une meilleure vue d'ensemble lors de l'affichage de l'évolution d'une branche de sujet particulière, parce que la fusion dans une branche de sujet a tendance à n'être que des mises à jour avec l'amont de temps en temps, et cette option permet d'ignorer les commits individuels apportés dans votre historique par de telles fusions."
#. type: Plain text
#: en/rev-list-options.txt:136
@@ -63419,10 +62335,7 @@ msgstr "--bisect"
#: en/rev-list-options.txt:210
#, priority:260
msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line."
-msgstr ""
-"Faire comme si le mauvais bissection ref `refs/bisect/bad` a été inscrite "
-"comme si elle a été suivie par `--not` et que les bonnes refs de bissection `"
-"refs/bisect/good-*` sur la ligne de commande."
+msgstr "Faire comme si le mauvais bissection ref `refs/bisect/bad` a été inscrite comme si elle a été suivie par `--not` et que les bonnes refs de bissection `refs/bisect/good-*` sur la ligne de commande."
#. type: Plain text
#: en/rev-list-options.txt:217
@@ -64216,11 +63129,7 @@ msgstr "En plus des commits indiqués dans l’historique par défaut, montrer c
#: en/rev-list-options.txt:683
#, priority:260
msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
-msgstr ""
-"Quand un commit de fusion est inclus par `--show-pulls`, cette fusion est "
-"traitée comme si elle avait \"tiré\" le changement d'une autre branche. "
-"Lorsque l'on utilise `--show-pulls` sur cet exemple (et aucune autre option)"
-", le graphe résultant est :"
+msgstr "Quand un commit de fusion est inclus par `--show-pulls`, cette fusion est traitée comme si elle avait \"tiré\" le changement d'une autre branche. Lorsque l'on utilise `--show-pulls` sur cet exemple (et aucune autre option), le graphe résultant est :"
#. type: delimited block -
#: en/rev-list-options.txt:686
@@ -64308,11 +63217,7 @@ msgstr ""
#: en/rev-list-options.txt:746
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one."
-msgstr ""
-"seraientt à peu près de la même longueur. Trouver le changement qui "
-"introduit une régression se réduit donc à une recherche binaire : générer et "
-"tester à plusieurs reprises de nouveaux 'midpoint' jusqu'à ce que la chaîne "
-"de commits soit de longueur un."
+msgstr "seraientt à peu près de la même longueur. Trouver le changement qui introduit une régression se réduit donc à une recherche binaire : générer et tester à plusieurs reprises de nouveaux 'midpoint' jusqu'à ce que la chaîne de commits soit de longueur un."
#. type: Labeled list
#: en/rev-list-options.txt:747
@@ -67418,6 +66323,82 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#~ msgid "the commit recorded in the superproject will be"
+#~ msgstr "le commit enregistré dans le superprojet sera"
+
+#~ msgid "checked out in the submodule on a detached HEAD.\n"
+#~ msgstr "extrait dans le sous-module avec une HEAD détachée.\n"
+
+#~ msgid "onto the commit recorded in the superproject.\n"
+#~ msgstr "sur le commit enregistré dans le super-projet.\n"
+
+#~ msgid "into the current branch in the submodule.\n"
+#~ msgstr "dans la branche actuelle du sous-module.\n"
+
+#~ msgid "arbitrary shell command that takes a single"
+#~ msgstr "commande shell arbitraire qui prend un seul"
+
+#~ msgid "color specification, as described under Values in the"
+#~ msgstr "la spécification de la couleur, comme décrit sous Valeurs dans la section"
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "make the next placeholder take at"
+#~ msgstr "faire le prochain espace réservé prendre"
+
+#~ msgid "columns, padding spaces on the right if necessary"
+#~ msgstr "colonnes, en insérant des espaces à droite si nécessaire"
+
+#~ msgid "but padding spaces on the left"
+#~ msgstr "mais en insérant des espaces à gauche"
+
+#~ msgid "similar to '%>(<N>)', '%>|(<N>)'"
+#~ msgstr "similaire à '%>(<N>)', '%>|(<N>)'"
+
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgstr "similaire à '%<(<N>)', '%<|(<N>)'"
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "ou linkgit:git-blame[1])"
+
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "partie locale de l'auteur (voir '%al') en respectant le fichier .mailmap, voir"
+
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "nom du validateur (en respectant .mailmap, voir"
+
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "e-mail du validateur (en respectant .mailmap, voir"
+
+#~ msgid "(like `git log --source`), only works with `git log`"
+#~ msgstr "(comme `git log --source`), ne fonctionne qu'avec `git log`"
+
+#~ msgid "show \"G\" for a good (valid) signature,"
+#~ msgstr "afficher \"G\" pour une bonne signature (valide),"
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "pour signer un commit signé"
+
+#~ msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
+#~ msgstr "sélecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2"
+
+#~ msgid "shortened reflog selector; same as `%gD`, but the refname"
+#~ msgstr "sélecteur de reflog raccourci ; identique à `%gD', mais la partie du nom du reflog"
+
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "nom de l'identité du reflog (en respectant le fichier.mailmap, voir"
+
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "adresse de courriel de l'identité reflog (en respectant le fichier .mailmap, voir"
+
+#~ msgid "display the trailers of the body as"
+#~ msgstr "afficher les lignes d'attribut du corps comme"
+
#~ msgid "Thus, the following command:"
#~ msgstr "Ainsi, la commande suivante :"
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 48cdbf6..ec47a30 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2019-12-10 22:56+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Labeled list
@@ -2434,18 +2434,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2454,16 +2446,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9824,7 +9810,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17051,16 +17037,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20614,16 +20594,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22447,17 +22421,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22473,18 +22442,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25819,7 +25782,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39705,283 +39668,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49236,16 +49078,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49260,28 +49096,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49296,20 +49120,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53546,16 +53360,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54386,16 +54194,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54494,16 +54296,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54518,22 +54314,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59470,16 +59254,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59501,33 +59279,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59536,16 +59302,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59554,16 +59314,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59572,16 +59326,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59590,16 +59338,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59699,15 +59441,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59729,9 +59465,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59753,15 +59489,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59867,9 +59597,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59891,9 +59621,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59915,9 +59645,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60028,16 +59758,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60124,16 +59848,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60178,16 +59896,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60208,16 +59920,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60226,16 +59932,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60257,9 +59957,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60281,9 +59981,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60304,16 +60004,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65607,6 +65301,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.id.po b/po/documentation.id.po
index f947c6e..126f75f 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -2434,18 +2434,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2454,16 +2446,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9824,7 +9810,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17051,16 +17037,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20614,16 +20594,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22447,17 +22421,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22473,18 +22442,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25819,7 +25782,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39705,283 +39668,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49236,16 +49078,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49260,28 +49096,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49296,20 +49120,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53546,16 +53360,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54386,16 +54194,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54494,16 +54296,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54518,22 +54314,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59470,16 +59254,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59501,33 +59279,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59536,16 +59302,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59554,16 +59314,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59572,16 +59326,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59590,16 +59338,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59699,15 +59441,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59729,9 +59465,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59753,15 +59489,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59867,9 +59597,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59891,9 +59621,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59915,9 +59645,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60028,16 +59758,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60124,16 +59848,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60178,16 +59896,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60208,16 +59920,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60226,16 +59932,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60257,9 +59957,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60281,9 +59981,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60304,16 +60004,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65607,6 +65301,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.is.po b/po/documentation.is.po
index a7dc139..beeb119 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.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: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-08-24 14:49+0000\n"
"Last-Translator: Þórhalla Guðmundsdóttir Beck <plergux@outlook.com>\n"
"Language-Team: Icelandic\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: Weblate 4.2.1-dev\n"
#. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
@@ -31,7 +31,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:560
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:582
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -91,8 +91,8 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
-#, ignore-same, no-wrap, priority:260
+#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
+#, ignore-same, no-wrap, priority:280
msgid "-t"
msgstr "-t"
@@ -127,163 +127,175 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:98 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:522 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#, ignore-same, no-wrap, priority:260
+msgid "--first-parent"
+msgstr "--first-parent"
+
+#. type: Plain text
+#: en/blame-options.txt:44
+#, priority:100
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall."
+msgstr ""
+
+#. type: Labeled list
+#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
#. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:216
#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr "--porcelain"
#. type: Plain text
-#: en/blame-options.txt:42
+#: en/blame-options.txt:48
#, priority:100
msgid "Show in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:43
+#: en/blame-options.txt:49
#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
-#: en/blame-options.txt:47
+#: en/blame-options.txt:53
#, priority:100
msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
+#: en/blame-options.txt:54 en/git-pack-objects.txt:138 en/git-svn.txt:373
#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
-#: en/blame-options.txt:51
+#: en/blame-options.txt:57
#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:52 en/git-mailinfo.txt:62 en/pretty-options.txt:35
+#: en/blame-options.txt:58 en/git-mailinfo.txt:62 en/pretty-options.txt:35
#, no-wrap, priority:260
msgid "--encoding=<encoding>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:58
+#: en/blame-options.txt:64
#, priority:100
msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:59
+#: en/blame-options.txt:65
#, no-wrap, priority:100
msgid "--contents <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:65
+#: en/blame-options.txt:71
#, priority:100
msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:66
+#: en/blame-options.txt:72
#, no-wrap, priority:100
msgid "--date <format>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:72
+#: en/blame-options.txt:78
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:73 en/git-fsck.txt:100
+#: en/blame-options.txt:79 en/git-fsck.txt:100
#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
-#: en/blame-options.txt:79
+#: en/blame-options.txt:85
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:80
+#: en/blame-options.txt:86
#, no-wrap, priority:100
msgid "-M[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:90
+#: en/blame-options.txt:96
#, priority:100
msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:95
+#: en/blame-options.txt:101
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:96
+#: en/blame-options.txt:102
#, no-wrap, priority:100
msgid "-C[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:105
+#: en/blame-options.txt:111
#, priority:100
msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:112
+#: en/blame-options.txt:118
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:113
+#: en/blame-options.txt:119
#, no-wrap, priority:100
msgid "--ignore-rev <rev>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:124
+#: en/blame-options.txt:130
#, priority:100
msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:125
+#: en/blame-options.txt:131
#, no-wrap, priority:100
msgid "--ignore-revs-file <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:131
+#: en/blame-options.txt:137
#, priority:100
msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
+#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
#. type: Plain text
-#: en/blame-options.txt:133
+#: en/blame-options.txt:139
#, priority:100
msgid "Show help message."
msgstr ""
@@ -481,7 +493,7 @@ msgid "Get and set repository or global options."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +505,7 @@ msgid "Git data exporter."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -972,254 +984,266 @@ msgstr "linkgit:git-log[1]"
msgid "Show commit logs."
msgstr ""
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:64
+#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-maintenance[1]"
+msgstr "linkgit:git-maintenance[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:66
+#, priority:100
+msgid "Run tasks to optimize Git repository data."
+msgstr ""
+
#. type: Plain text
-#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
+#: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:75
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:66
+#: en/cmds-mainporcelain.txt:69
#, priority:100
msgid "Join two or more development histories together."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:67
+#: en/cmds-mainporcelain.txt:70
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:69
+#: en/cmds-mainporcelain.txt:72
#, priority:100
msgid "Move or rename a file, a directory, or a symlink."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:70
+#: en/cmds-mainporcelain.txt:73
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:72
+#: en/cmds-mainporcelain.txt:75
#, priority:100
msgid "Add or inspect object notes."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
+#: en/cmds-mainporcelain.txt:76 en/git-fetch.txt:300
#, ignore-same, no-wrap, priority:220
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:75
+#: en/cmds-mainporcelain.txt:78
#, priority:100
msgid "Fetch from and integrate with another repository or a local branch."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:76
+#: en/cmds-mainporcelain.txt:79
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:78
+#: en/cmds-mainporcelain.txt:81
#, priority:100
msgid "Update remote refs along with associated objects."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:79
+#: en/cmds-mainporcelain.txt:82
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:81
+#: en/cmds-mainporcelain.txt:84
#, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1172
+#: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1172
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:84
+#: en/cmds-mainporcelain.txt:87
#, priority:100
msgid "Reapply commits on top of another base tip."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:85
+#: en/cmds-mainporcelain.txt:88
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:87
+#: en/cmds-mainporcelain.txt:90
#, priority:100
msgid "Reset current HEAD to the specified state."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:88
+#: en/cmds-mainporcelain.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-restore[1]"
msgstr "linkgit:git-restore[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:90
+#: en/cmds-mainporcelain.txt:93
#, priority:100
msgid "Restore working tree files."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:243
+#: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:243
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:93
+#: en/cmds-mainporcelain.txt:96
#, priority:100
msgid "Revert some existing commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:94
+#: en/cmds-mainporcelain.txt:97
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:96
+#: en/cmds-mainporcelain.txt:99
#, priority:100
msgid "Remove files from the working tree and from the index."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:97
+#: en/cmds-mainporcelain.txt:100
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:99
+#: en/cmds-mainporcelain.txt:102
#, priority:100
msgid "Summarize 'git log' output."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:100
+#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:102
+#: en/cmds-mainporcelain.txt:105
#, priority:100
msgid "Show various types of objects."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:103
+#: en/cmds-mainporcelain.txt:106
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sparse-checkout[1]"
msgstr "linkgit:git-sparse-checkout[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Initialize and modify the sparse-checkout."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121
+#: en/cmds-mainporcelain.txt:124
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:127 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:126
+#: en/cmds-mainporcelain.txt:129
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -1417,7 +1441,7 @@ msgid "Show packed archive index."
msgstr ""
#. type: Plain text
-#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
+#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:417
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -2041,7 +2065,7 @@ msgid "Update auxiliary info file to help dumb servers."
msgstr ""
#. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:274
#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
msgstr ""
@@ -2413,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2433,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -2464,7 +2474,7 @@ msgid "The value for many variables that specify various sizes can be suffixed w
msgstr ""
#. type: Labeled list
-#: en/config.txt:260 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175
#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"
@@ -2518,7 +2528,7 @@ msgid "A variable that takes a pathname value can be given a string that begins
msgstr ""
#. type: Title ~
-#: en/config.txt:304 en/git-imap-send.txt:58
+#: en/config.txt:304
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
@@ -2746,11 +2756,29 @@ msgid "merge.log"
msgstr "merge.log"
#. type: Plain text
-#: en/config/fmt-merge-msg.txt:10
+#: en/config/fmt-merge-msg.txt:11
#, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
msgstr ""
+#. type: Labeled list
+#: en/config/fmt-merge-msg.txt:12
+#, ignore-same, no-wrap, priority:240
+msgid "merge.suppressDest"
+msgstr "merge.suppressDest"
+
+#. type: Plain text
+#: en/config/fmt-merge-msg.txt:18
+#, priority:240
+msgid "By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit \"into <branch name>\" from its title."
+msgstr ""
+
+#. type: Plain text
+#: en/config/fmt-merge-msg.txt:22
+#, priority:240
+msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility."
+msgstr ""
+
#. type: Title -
#: en/date-formats.txt:2
#, no-wrap, priority:280
@@ -3284,49 +3312,49 @@ msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:14
+#: en/diff-generate-patch.txt:15
#, priority:260
-msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:17
+#: en/diff-generate-patch.txt:18
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:19
+#: en/diff-generate-patch.txt:20
#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:21
+#: en/diff-generate-patch.txt:22
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:25
+#: en/diff-generate-patch.txt:26
#, priority:260
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:29
+#: en/diff-generate-patch.txt:30
#, priority:260
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:31
+#: en/diff-generate-patch.txt:32
#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:43
+#: en/diff-generate-patch.txt:44
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3343,43 +3371,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:46
+#: en/diff-generate-patch.txt:47
#, priority:260
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:48
+#: en/diff-generate-patch.txt:49
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:55
+#: en/diff-generate-patch.txt:56
#, priority:260
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:59
+#: en/diff-generate-patch.txt:60
#, priority:260
msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:63
+#: en/diff-generate-patch.txt:64
#, priority:260
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:68
+#: en/diff-generate-patch.txt:69
#, priority:260
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:75
+#: en/diff-generate-patch.txt:76
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3391,25 +3419,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:78
+#: en/diff-generate-patch.txt:79
#, no-wrap, priority:260
msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:86
+#: en/diff-generate-patch.txt:87
#, priority:260
msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:88
+#: en/diff-generate-patch.txt:89
#, priority:260
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:97
+#: en/diff-generate-patch.txt:98
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3422,7 +3450,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:107
+#: en/diff-generate-patch.txt:108
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3437,7 +3465,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:118
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3452,37 +3480,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:122
#, priority:260
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:124
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:125
+#: en/diff-generate-patch.txt:126
#, priority:260
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:127
+#: en/diff-generate-patch.txt:128
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:130
+#: en/diff-generate-patch.txt:131
#, priority:260
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:135
+#: en/diff-generate-patch.txt:136
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3492,91 +3520,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:141
+#: en/diff-generate-patch.txt:142
#, priority:260
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:143
+#: en/diff-generate-patch.txt:144
#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:145 en/diff-generate-patch.txt:156 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
#, priority:260
msgid "a/file"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
+#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
#, priority:260
msgid "b/file"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:150
+#: en/diff-generate-patch.txt:151
#, priority:260
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:154
+#: en/diff-generate-patch.txt:155
#, priority:260
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:163
+#: en/diff-generate-patch.txt:164
#, priority:260
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:169
+#: en/diff-generate-patch.txt:170
#, priority:260
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:171
+#: en/diff-generate-patch.txt:172
#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:174
+#: en/diff-generate-patch.txt:175
#, priority:260
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:183
+#: en/diff-generate-patch.txt:184
#, ignore-ellipsis, priority:260
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:189
+#: en/diff-generate-patch.txt:190
#, priority:260
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:195
+#: en/diff-generate-patch.txt:196
#, priority:260
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:201
+#: en/diff-generate-patch.txt:202
#, priority:260
msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:409 en/merge-options.txt:93
+#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:93
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3588,13 +3616,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:209 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -3724,356 +3752,362 @@ msgstr "--patch-with-raw"
msgid "Synonym for `-p --raw`."
msgstr ""
+#. type: Plain text
+#: en/diff-options.txt:79
+#, priority:280
+msgid "Show the tree objects in the diff output."
+msgstr ""
+
#. type: Labeled list
-#: en/diff-options.txt:76
+#: en/diff-options.txt:81
#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
#. type: Plain text
-#: en/diff-options.txt:79
+#: en/diff-options.txt:84
#, priority:280
msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:80
+#: en/diff-options.txt:85
#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
#. type: Plain text
-#: en/diff-options.txt:82
+#: en/diff-options.txt:87
#, priority:280
msgid "Disable the indent heuristic."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:83
+#: en/diff-options.txt:88
#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"
#. type: Plain text
-#: en/diff-options.txt:86 en/diff-options.txt:112
+#: en/diff-options.txt:91 en/diff-options.txt:117
#, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:87
+#: en/diff-options.txt:92
#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"
#. type: Plain text
-#: en/diff-options.txt:89
+#: en/diff-options.txt:94
#, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:90
+#: en/diff-options.txt:95
#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"
#. type: Plain text
-#: en/diff-options.txt:92
+#: en/diff-options.txt:97
#, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:93
+#: en/diff-options.txt:98
#, no-wrap, priority:280
msgid "--anchored=<text>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:95
+#: en/diff-options.txt:100
#, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:97
+#: en/diff-options.txt:102
#, priority:280
msgid "This option may be specified more than once."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:102
+#: en/diff-options.txt:107
#, priority:280
msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:103
+#: en/diff-options.txt:108
#, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:105
+#: en/diff-options.txt:110
#, priority:280
msgid "Choose a diff algorithm. The variants are as follows:"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:107
+#: en/diff-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"
#. type: Plain text
-#: en/diff-options.txt:109
+#: en/diff-options.txt:114
#, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:109
+#: en/diff-options.txt:114
#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
-#: en/diff-options.txt:112
+#: en/diff-options.txt:117
#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"
#. type: Plain text
-#: en/diff-options.txt:114
+#: en/diff-options.txt:119
#, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:114
+#: en/diff-options.txt:119
#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"
#. type: Plain text
-#: en/diff-options.txt:117
+#: en/diff-options.txt:122
#, priority:280
msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:122
+#: en/diff-options.txt:127
#, priority:280
msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:123
+#: en/diff-options.txt:128
#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:137
+#: en/diff-options.txt:142
#, ignore-ellipsis, priority:280
msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:140
+#: en/diff-options.txt:145
#, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:141
+#: en/diff-options.txt:146
#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"
#. type: Plain text
-#: en/diff-options.txt:148
+#: en/diff-options.txt:153
#, priority:280
msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:149 en/git-apply.txt:45
+#: en/diff-options.txt:154 en/git-apply.txt:45
#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr "--numstat"
#. type: Plain text
-#: en/diff-options.txt:155
+#: en/diff-options.txt:160
#, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:156
+#: en/diff-options.txt:161
#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"
#. type: Plain text
-#: en/diff-options.txt:160
+#: en/diff-options.txt:165
#, priority:280
msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:161
+#: en/diff-options.txt:166
#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:162
+#: en/diff-options.txt:167
#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:169
+#: en/diff-options.txt:174
#, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:171
+#: en/diff-options.txt:176
#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
-#: en/diff-options.txt:177
+#: en/diff-options.txt:182
#, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:177
+#: en/diff-options.txt:182
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"
#. type: Plain text
-#: en/diff-options.txt:185
+#: en/diff-options.txt:190
#, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:185
+#: en/diff-options.txt:190
#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"
#. type: Plain text
-#: en/diff-options.txt:190
+#: en/diff-options.txt:195
#, priority:280
msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:190
+#: en/diff-options.txt:195
#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"
#. type: Plain text
-#: en/diff-options.txt:195
+#: en/diff-options.txt:200
#, priority:280
msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:195 en/git-cherry.txt:39
+#: en/diff-options.txt:200 en/git-cherry.txt:39
#, no-wrap, priority:280
msgid "<limit>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:199
+#: en/diff-options.txt:204
#, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:205
+#: en/diff-options.txt:210
#, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:206
+#: en/diff-options.txt:211
#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr "--cumulative"
#. type: Plain text
-#: en/diff-options.txt:208
+#: en/diff-options.txt:213
#, priority:280
msgid "Synonym for --dirstat=cumulative"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:209
+#: en/diff-options.txt:214
#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:211
+#: en/diff-options.txt:216
#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
+#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
#. type: Plain text
-#: en/diff-options.txt:215
+#: en/diff-options.txt:220
#, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:217
+#: en/diff-options.txt:222
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
#. type: Plain text
-#: en/diff-options.txt:219
+#: en/diff-options.txt:224
#, priority:280
msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 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:174
+#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 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:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
#. type: Plain text
-#: en/diff-options.txt:226
+#: en/diff-options.txt:231
#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:229
+#: en/diff-options.txt:234
#, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:233
+#: en/diff-options.txt:238
#, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
@@ -4081,61 +4115,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:238 en/git-apply.txt:122
+#: en/diff-options.txt:243 en/git-apply.txt:122
#, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
#. type: Plain text
-#: en/diff-options.txt:241
+#: en/diff-options.txt:246
#, priority:280
msgid "Show only names of changed files."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:242 en/git-ls-tree.txt:60
+#: en/diff-options.txt:247 en/git-ls-tree.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"
#. type: Plain text
-#: en/diff-options.txt:245
+#: en/diff-options.txt:250
#, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:246
+#: en/diff-options.txt:251
#, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:257
+#: en/diff-options.txt:262
#, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:262
+#: en/diff-options.txt:267
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:265
+#: en/diff-options.txt:270
#, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
@@ -4143,49 +4177,49 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
+#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
#. type: Plain text
-#: en/diff-options.txt:269
+#: en/diff-options.txt:274
#, priority:280
msgid "Turn off colored diff."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:271
+#: en/diff-options.txt:276
#, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:273
+#: en/diff-options.txt:278
#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:274
+#: en/diff-options.txt:279
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:276
+#: en/diff-options.txt:281
#, priority:280
msgid "Moved lines of code are colored differently."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:278
+#: en/diff-options.txt:283
#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:282
+#: en/diff-options.txt:287
#, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
@@ -4194,409 +4228,409 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:284 en/diff-options.txt:326
+#: en/diff-options.txt:289 en/diff-options.txt:331
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
#. type: Plain text
-#: en/diff-options.txt:286
+#: en/diff-options.txt:291
#, priority:280
msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:286 en/git-commit.txt:212
+#: en/diff-options.txt:291 en/git-commit.txt:212
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
#. type: Plain text
-#: en/diff-options.txt:289
+#: en/diff-options.txt:294
#, priority:280
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:289 en/diff-options.txt:358
+#: en/diff-options.txt:294 en/diff-options.txt:363
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
#. type: Plain text
-#: en/diff-options.txt:296
+#: en/diff-options.txt:301
#, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:296
+#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
#. type: Plain text
-#: en/diff-options.txt:301
+#: en/diff-options.txt:306
#, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:301
+#: en/diff-options.txt:306
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
#. type: Plain text
-#: en/diff-options.txt:306
+#: en/diff-options.txt:311
#, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:306
+#: en/diff-options.txt:311
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
#. type: Plain text
-#: en/diff-options.txt:311
+#: en/diff-options.txt:316
#, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:313
+#: en/diff-options.txt:318
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"
#. type: Plain text
-#: en/diff-options.txt:316
+#: en/diff-options.txt:321
#, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:317
+#: en/diff-options.txt:322
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:320
+#: en/diff-options.txt:325
#, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:322
+#: en/diff-options.txt:327
#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:324
+#: en/diff-options.txt:329
#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:328
+#: en/diff-options.txt:333
#, priority:280
msgid "Do not ignore whitespace when performing move detection."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:328 en/merge-strategies.txt:61
+#: en/diff-options.txt:333 en/merge-strategies.txt:61
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:335 en/diff-options.txt:674
#, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:330 en/merge-strategies.txt:59
+#: en/diff-options.txt:335 en/merge-strategies.txt:59
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:339 en/diff-options.txt:680
#, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:334 en/merge-strategies.txt:60
+#: en/diff-options.txt:339 en/merge-strategies.txt:60
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:337
+#: en/diff-options.txt:342
#, 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:337
+#: en/diff-options.txt:342
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
#. type: Plain text
-#: en/diff-options.txt:342
+#: en/diff-options.txt:347
#, priority:280
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:344
+#: en/diff-options.txt:349
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
#. type: Plain text
-#: en/diff-options.txt:348
+#: en/diff-options.txt:353
#, priority:280
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:349
+#: en/diff-options.txt:354
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:354
+#: en/diff-options.txt:359
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:358
+#: en/diff-options.txt:363
#, priority:280
msgid "Highlight changed words using only colors. Implies `--color`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:362
+#: en/diff-options.txt:367
#, priority:280
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:362
+#: en/diff-options.txt:367
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
#. type: Plain text
-#: en/diff-options.txt:369
+#: en/diff-options.txt:374
#, priority:280
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
+#: en/diff-options.txt:374 en/git-daemon.txt:131 en/git-submodule.txt:172
#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
#. type: Plain text
-#: en/diff-options.txt:371
+#: en/diff-options.txt:376
#, priority:280
msgid "Disable word diff again."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:375
+#: en/diff-options.txt:380
#, priority:280
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:376
+#: en/diff-options.txt:381
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:380
+#: en/diff-options.txt:385
#, priority:280
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:388
+#: en/diff-options.txt:393
#, priority:280
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:391
+#: en/diff-options.txt:396
#, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:396
+#: en/diff-options.txt:401
#, priority:280
msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:397
+#: en/diff-options.txt:402
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:400
+#: en/diff-options.txt:405
#, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:143
+#: en/diff-options.txt:407 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
#. type: Plain text
-#: en/diff-options.txt:405
+#: en/diff-options.txt:410
#, priority:280
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:406
+#: en/diff-options.txt:411
#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
msgstr "--[no-]rename-empty"
#. type: Plain text
-#: en/diff-options.txt:408
+#: en/diff-options.txt:413
#, priority:280
msgid "Whether to use empty blobs as rename source."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:410 en/git-apply.txt:58
+#: en/diff-options.txt:415 en/git-apply.txt:58
#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr "--check"
#. type: Plain text
-#: en/diff-options.txt:419
+#: en/diff-options.txt:424
#, priority:280
msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:420
+#: en/diff-options.txt:425
#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:429
+#: en/diff-options.txt:434
#, priority:280
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:432
+#: en/diff-options.txt:437
#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr "--full-index"
#. type: Plain text
-#: en/diff-options.txt:436
+#: en/diff-options.txt:441
#, priority:280
msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:437 en/git-apply.txt:160
+#: en/diff-options.txt:442 en/git-apply.txt:160
#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr "--binary"
#. type: Plain text
-#: en/diff-options.txt:440
+#: en/diff-options.txt:445
#, priority:280
msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
+#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:448
+#: en/diff-options.txt:454
#, priority:280
-msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
+msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:449
+#: en/diff-options.txt:455
#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:450
+#: en/diff-options.txt:456
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:453
+#: en/diff-options.txt:459
#, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:463
+#: en/diff-options.txt:469
#, priority:280
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:471
+#: en/diff-options.txt:477
#, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:472
+#: en/diff-options.txt:478
#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:147
+#: en/diff-options.txt:479 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:476
+#: en/diff-options.txt:482
#, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:481
+#: en/diff-options.txt:487
#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
@@ -4605,7 +4639,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:491
+#: en/diff-options.txt:497
#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
@@ -4620,139 +4654,139 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:492
+#: en/diff-options.txt:498
#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:493
+#: en/diff-options.txt:499
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:496
+#: en/diff-options.txt:502
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:497 en/git-svn.txt:626
+#: en/diff-options.txt:503 en/git-svn.txt:626
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
-#: en/diff-options.txt:505
+#: en/diff-options.txt:511
#, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
+#: en/diff-options.txt:512 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:507
+#: en/diff-options.txt:513
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
#. type: Plain text
-#: en/diff-options.txt:515
+#: en/diff-options.txt:521
#, priority:280
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:518
+#: en/diff-options.txt:524
#, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:519 en/git-svn.txt:625
+#: en/diff-options.txt:525 en/git-svn.txt:625
#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:525
+#: en/diff-options.txt:531
#, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:527
+#: en/diff-options.txt:533
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:538
+#: en/diff-options.txt:544
#, 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:541
+#: en/diff-options.txt:547
#, 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:547
+#: en/diff-options.txt:553
#, 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:548
+#: en/diff-options.txt:554
#, no-wrap, priority:280
msgid "-S<string>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:552
+#: en/diff-options.txt:558
#, 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:558
+#: en/diff-options.txt:564
#, 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:560
+#: en/diff-options.txt:566
#, priority:280
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:561
+#: en/diff-options.txt:567
#, no-wrap, priority:280
msgid "-G<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:564
+#: en/diff-options.txt:570
#, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:568
+#: en/diff-options.txt:574
#, 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:573
+#: en/diff-options.txt:579
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -4761,385 +4795,391 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:578
+#: en/diff-options.txt:584
#, 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:581
+#: en/diff-options.txt:587
#, 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:584
+#: en/diff-options.txt:590
#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:585
+#: en/diff-options.txt:591
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:590
+#: en/diff-options.txt:596
#, 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:593
+#: en/diff-options.txt:599
#, 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:594
+#: en/diff-options.txt:600
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
#, 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:599
+#: en/diff-options.txt:605
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
-#: en/diff-options.txt:602
+#: en/diff-options.txt:608
#, 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:605 en/git-mergetool.txt:95
+#: en/diff-options.txt:611 en/git-mergetool.txt:95
#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:610
+#: en/diff-options.txt:616
#, 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:622
+#: en/diff-options.txt:628
#, 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:624
+#: en/diff-options.txt:630
#, priority:280
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:628
+#: en/diff-options.txt:634
#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
#, 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:634
+#: en/diff-options.txt:640
#, priority:280
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:641
+#: en/diff-options.txt:647
#, 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:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
+#: en/diff-options.txt:649 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:646
+#: en/diff-options.txt:652
#, 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:647
+#: en/diff-options.txt:654
#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
+#. type: Labeled list
+#: en/diff-options.txt:655
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
#. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:664
#, 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."
+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:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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:665 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:666 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
#. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:668
#, priority:280
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:669
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:671
#, priority:280
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:672
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:676 en/git-am.txt:107 en/git-apply.txt:182
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 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:673
+#: en/diff-options.txt:682
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:686
#, 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:678
+#: en/diff-options.txt:687
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:689
#, priority:280
msgid "Ignore changes whose lines are all blank."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:690
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:695
#, 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:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:697 en/git-grep.txt:265
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
#. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:699
#, priority:280
msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:702 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:697
+#: en/diff-options.txt:706
#, 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:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:707 en/fetch-options.txt:238 en/git-am.txt:74 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:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222 en/merge-options.txt:147 en/rev-list-options.txt:219
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
#. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:709
#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:712
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:716
#, 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:708
+#: en/diff-options.txt:717
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:719
#, priority:280
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:720 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:721 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:730
#, 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:722 en/git-status.txt:87
+#: en/diff-options.txt:731 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:743
#, 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:735
+#: en/diff-options.txt:744
#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:746
#, priority:280
msgid "Show the given source prefix instead of \"a/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:747
#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:749
#, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:750
#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
#. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:752
#, priority:280
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:753
#, no-wrap, priority:280
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:755
#, priority:280
msgid "Prepend an additional prefix to every line of output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:756
#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:763
#, 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:756
+#: en/diff-options.txt:765
#, 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:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: 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:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5271,7 +5311,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 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:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 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:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:212
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5283,25 +5323,37 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:67 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:429 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:68
+#, ignore-same, no-wrap, priority:220
+msgid "--[no-]write-fetch-head"
+msgstr "--[no-]write-fetch-head"
+
+#. type: Plain text
+#: en/fetch-options.txt:74
+#, 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:76 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:153
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:68 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:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:77 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:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
#. type: Plain text
-#: en/fetch-options.txt:71
+#: en/fetch-options.txt:80
#, 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:74
+#: en/fetch-options.txt:83
#, no-wrap, priority:220
msgid ""
"\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5309,379 +5361,385 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:77
+#: en/fetch-options.txt:86
#, no-wrap, priority:220
msgid "\tin the `<refspec>` part below.\n"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:79
+#: en/fetch-options.txt:88
#, no-wrap, priority:220
msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:80 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
+#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
#. type: Labeled list
-#: en/fetch-options.txt:81 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
+#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr "--keep"
#. type: Plain text
-#: en/fetch-options.txt:83
+#: en/fetch-options.txt:92
#, priority:220
msgid "Keep downloaded pack."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:85
+#: en/fetch-options.txt:94
#, ignore-same, no-wrap, priority:220
msgid "--multiple"
msgstr "--multiple"
#. type: Plain text
-#: en/fetch-options.txt:88
+#: en/fetch-options.txt:97
#, 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:89
+#: en/fetch-options.txt:98
+#, ignore-same, no-wrap, priority:220
+msgid "--[no-]auto-maintenance"
+msgstr "--[no-]auto-maintenance"
+
+#. type: Labeled list
+#: en/fetch-options.txt:99
#, ignore-same, no-wrap, priority:220
msgid "--[no-]auto-gc"
msgstr "--[no-]auto-gc"
#. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:103
#, priority:220
-msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
+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:93
+#: en/fetch-options.txt:104
#, ignore-same, no-wrap, priority:220
msgid "--[no-]write-commit-graph"
msgstr "--[no-]write-commit-graph"
#. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:107
#, priority:220
msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:99 en/git-push.txt:153
+#: en/fetch-options.txt:110 en/git-push.txt:153
#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr "--prune"
#. type: Plain text
-#: en/fetch-options.txt:109
+#: en/fetch-options.txt:120
#, 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:112 en/fetch-options.txt:123
+#: en/fetch-options.txt:123 en/fetch-options.txt:134
#, priority:220
msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:114
+#: en/fetch-options.txt:125
#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr "--prune-tags"
#. type: Plain text
-#: en/fetch-options.txt:121
+#: en/fetch-options.txt:132
#, 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:127 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 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:174 en/merge-options.txt:92
+#: en/fetch-options.txt:138 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 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:211 en/merge-options.txt:92
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
-#: en/fetch-options.txt:129 en/git-clone.txt:250
+#: en/fetch-options.txt:140 en/git-clone.txt:250
#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
#. type: Plain text
-#: en/fetch-options.txt:135
+#: en/fetch-options.txt:146
#, 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:136
+#: en/fetch-options.txt:147
#, no-wrap, priority:220
msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:146
+#: en/fetch-options.txt:157
#, 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:148 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:159 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:155
+#: en/fetch-options.txt:166
#, 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:157
+#: en/fetch-options.txt:168
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:179
#, 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:170
+#: en/fetch-options.txt:181
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:182
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:184
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:178
+#: en/fetch-options.txt:189
#, 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:181
+#: en/fetch-options.txt:192
#, 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:183 en/git-checkout.txt:294 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
+#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:186
+#: en/fetch-options.txt:197
#, 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:188 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:199 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:205
#, priority:220
-msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+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:196
+#: en/fetch-options.txt:207
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:211
#, 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:201
+#: en/fetch-options.txt:212
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:208
+#: en/fetch-options.txt:219
#, 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:210
+#: en/fetch-options.txt:221
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:217
+#: en/fetch-options.txt:228
#, 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:219 en/git-clone.txt:199
+#: en/fetch-options.txt:230 en/git-clone.txt:199
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upphalspakki>"
#. type: Plain text
-#: en/fetch-options.txt:224
+#: en/fetch-options.txt:235
#, 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:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 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:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:237 en/git-am.txt:73 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:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 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:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:231
+#: en/fetch-options.txt:242
#, 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:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:401 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:225 en/merge-options.txt:150
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 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:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402 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:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:235 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
+#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
#, priority:300
msgid "Be verbose."
msgstr "Sýna ferlisupplýsingar."
#. type: Labeled list
-#: en/fetch-options.txt:237 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
+#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:242 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:243 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:254 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:244 en/git-clone.txt:136 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:255 en/git-clone.txt:136 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:251 en/git-clone.txt:143
+#: en/fetch-options.txt:262 en/git-clone.txt:143
#, 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:252
+#: en/fetch-options.txt:263
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:257
+#: en/fetch-options.txt:268
#, 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:258
+#: en/fetch-options.txt:269
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:264
+#: en/fetch-options.txt:275
#, 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:265 en/git-push.txt:398
+#: en/fetch-options.txt:276 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:266 en/git-push.txt:399
+#: en/fetch-options.txt:277 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:268 en/git-push.txt:401
+#: en/fetch-options.txt:279 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:269 en/git-push.txt:402
+#: en/fetch-options.txt:280 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:270 en/git-push.txt:403
+#: en/fetch-options.txt:281 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:271 en/git-push.txt:405
+#: en/fetch-options.txt:282 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -5727,7 +5785,7 @@ msgstr ""
"\t [--] [<pathspec>...]\n"
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt: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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-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:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt: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:36 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt: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
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr "ÚTSKÝRING"
@@ -5769,13 +5827,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:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 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:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt: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:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-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:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:108 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:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 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:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 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:30 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:44 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:151 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:357 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr "<slóðatilgreining> ..."
@@ -5805,13 +5863,13 @@ 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:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:483 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:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:484 en/git-rebase.txt:626 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5967,7 +6025,7 @@ msgid "If some files could not be added because of errors indexing them, do not
msgstr "Ef ekki er hægt að bæta við skjölum vegna villna við skráningu, ekki hætta við aðgerðina heldur halda áfram að bæta öðrum skjölum við. Skipuninni mun samt ljúka í \"ekki núll\" stöðu, þ.e. ekki villulaust. Hægt er að skrá breytuna `add.ignoreErrors` (hunsa villur í viðbótum) sem \"true\" (satt) til þess að þetta sé forstillt hegðun."
#. type: Labeled list
-#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
+#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200
#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -6015,31 +6073,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:311 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
+#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
#, 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:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
+#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
#, 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:319 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
+#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
#, 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:323 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
+#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
#, 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:354 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 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:355 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr "\\--"
@@ -6051,7 +6109,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:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 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:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:511 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 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:135 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:294 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:169 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:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:393
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr "DÆMI"
@@ -6093,7 +6151,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr "Vegna þess að þetta dæmi leyfir skelinni að útvíkka stjörnuna (þ.e. þú ert að lista skjölin beint), tekur hún ekki til greina`undirskrá/git-foo.sh`(þú hefur einungis tilgreint skjöl í þessari skrá)."
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:799
+#: en/git-add.txt:235 en/git-rebase.txt:821
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr "GAGNVIRKT FYRIRKOMULAG"
@@ -6429,7 +6487,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:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 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:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:597 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:537 en/git-difftool.txt:137 en/git-diff.txt:205 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:415 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 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"
@@ -6441,13 +6499,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:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:602 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:215 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:419 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 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:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:178 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:419 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:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:603 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:216 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:420 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 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:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:179 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:420 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"
@@ -6497,7 +6555,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:476 en/git-revert.txt:101 en/merge-options.txt:80
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101 en/merge-options.txt:80
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6539,7 +6597,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6557,7 +6615,7 @@ msgid "Remove everything in body before a scissors line (see linkgit:git-mailinf
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:59 en/git-mailinfo.txt:90
+#: en/git-am.txt:59 en/git-mailinfo.txt:89
#, ignore-same, no-wrap, priority:100
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -6569,7 +6627,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6661,37 +6719,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:382 en/git-revert.txt:115
+#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:383 en/git-revert.txt:116
+#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:386 en/git-revert.txt:119
+#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:461 en/git-rebase.txt:613
+#. type: Labeled list
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:462
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:462
+#: en/git-am.txt:109 en/git-rebase.txt:478
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:419
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:420
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6750,8 +6808,8 @@ msgstr ""
msgid "Run interactively."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:469 en/git-rebase.txt:611
+#. type: Labeled list
+#: en/git-am.txt:131 en/git-rebase.txt:485
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6762,8 +6820,8 @@ msgstr "--committer-date-is-author-date"
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:470 en/git-rebase.txt:612
+#. type: Labeled list
+#: en/git-am.txt:138 en/git-rebase.txt:490
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6775,7 +6833,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:335 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:336 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6787,37 +6845,37 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:387 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:388 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:389 en/git-revert.txt:93 en/merge-options.txt:64
+#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
-#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
+#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:396 en/git-revert.txt:99
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
+#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6847,7 +6905,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
+#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6859,7 +6917,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:256 en/sequencer.txt:10
+#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6883,7 +6941,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts. If `raw
msgstr ""
#. type: Title -
-#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:180 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:81 en/git-stash.txt:245 en/git-tag.txt:231
+#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:226 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:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -7065,7 +7123,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:404 en/merge-options.txt:91
+#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7103,7 +7161,7 @@ msgstr "--index"
#. type: Plain text
#: en/git-apply.txt:71
#, priority:100
-msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up to date, it is flagged as an error. This flag also causes the index file to be updated."
+msgid "Apply the patch to both the index and the working tree (or merely check that it would apply cleanly to both if `--check` is in effect). Note that `--index` expects index entries and working tree copies for relevant paths to be identical (their contents and metadata such as file mode must match), and will raise an error if they are not, even if the patch would apply cleanly to both the index and the working tree in isolation."
msgstr ""
#. type: Labeled list
@@ -7115,7 +7173,7 @@ msgstr "--cached"
#. type: Plain text
#: en/git-apply.txt:76
#, priority:100
-msgid "Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`."
+msgid "Apply the patch to just the index, without touching the working tree. If `--check` is in effect, merely check that it would apply cleanly to the index entry."
msgstr ""
#. type: Plain text
@@ -7149,7 +7207,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:815
+#: en/git-apply.txt:105 en/rev-list-options.txt:814
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -7203,7 +7261,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:263 en/git-rebase.txt:632
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7395,7 +7453,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:185 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7708,288 +7766,301 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
+#, fuzzy, no-wrap, priority:100
+#| msgid "--pathspec-from-file=<file>"
+msgid "--add-file=<file>"
+msgstr "--pathspec-from-file=<skjal>"
+
+#. type: Plain text
+#: en/git-archive.txt:63
+#, priority:100
+msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value for `--prefix` (if any) and the basename of <file>."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-archive.txt:64
#, ignore-same, no-wrap, priority:100
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
#. type: Plain text
-#: en/git-archive.txt:61
+#: en/git-archive.txt:67
#, priority:100
msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:62
+#: en/git-archive.txt:68
#, no-wrap, priority:100
msgid "<extra>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:65
+#: en/git-archive.txt:71
#, priority:100
msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:66
+#: en/git-archive.txt:72
#, no-wrap, priority:100
msgid "--remote=<repo>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:72
+#: en/git-archive.txt:78
#, priority:100
msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:73
+#: en/git-archive.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--exec=<git-upload-archive>"
msgstr "--exec=<git-upload-archive>"
#. type: Plain text
-#: en/git-archive.txt:76
+#: en/git-archive.txt:82
#, priority:100
msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
+#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:79
+#: en/git-archive.txt:85
#, priority:100
msgid "The tree or commit to produce an archive for."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:80
+#: en/git-archive.txt:86
#, no-wrap, priority:100
msgid "<path>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:84
+#: en/git-archive.txt:90
#, priority:100
msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
msgstr ""
#. type: Title -
-#: en/git-archive.txt:86
+#: en/git-archive.txt:92
#, no-wrap, priority:100
msgid "BACKEND EXTRA OPTIONS"
msgstr ""
#. type: Title ~
-#: en/git-archive.txt:89
+#: en/git-archive.txt:95
#, no-wrap, priority:100
msgid "zip"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:121
#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr "-0"
#. type: Plain text
-#: en/git-archive.txt:92
+#: en/git-archive.txt:98
#, priority:100
msgid "Store the files instead of deflating them."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:92
+#: en/git-archive.txt:98
#, ignore-same, no-wrap, priority:100
msgid "-9"
msgstr "-9"
#. type: Plain text
-#: en/git-archive.txt:95
+#: en/git-archive.txt:101
#, priority:100
msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:100
+#: en/git-archive.txt:106
#, no-wrap, priority:100
msgid "tar.umask"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:107
+#: en/git-archive.txt:113
#, priority:100
msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:108
+#: en/git-archive.txt:114
#, no-wrap, priority:100
msgid "tar.<format>.command"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:117
+#: en/git-archive.txt:123
#, priority:100
msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:120
+#: en/git-archive.txt:126
#, priority:100
msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:121
+#: en/git-archive.txt:127
#, no-wrap, priority:100
msgid "tar.<format>.remote"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:126
+#: en/git-archive.txt:132
#, priority:100
msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
msgstr ""
#. type: Title -
-#: en/git-archive.txt:129
+#: en/git-archive.txt:135
#, no-wrap, priority:100
msgid "ATTRIBUTES"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:131
+#: en/git-archive.txt:137
#, no-wrap, priority:100
msgid "export-ignore"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:134
+#: en/git-archive.txt:140
#, priority:100
msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:135
+#: en/git-archive.txt:141
#, no-wrap, priority:100
msgid "export-subst"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:139
+#: en/git-archive.txt:145
#, priority:100
msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:147
+#: en/git-archive.txt:153
#, priority:100
msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:150
+#: en/git-archive.txt:156
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:155
+#: en/git-archive.txt:161
#, priority:100
msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:156
+#: en/git-archive.txt:162
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:159
+#: en/git-archive.txt:165
#, priority:100
msgid "Create a compressed tarball for v1.4.0 release."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:160
+#: en/git-archive.txt:166
#, no-wrap, priority:100
msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:163
+#: en/git-archive.txt:169
#, priority:100
msgid "Same as above, but using the builtin tar.gz handling."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:164
+#: en/git-archive.txt:170
#, no-wrap, priority:100
msgid "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:167
+#: en/git-archive.txt:173
#, priority:100
msgid "Same as above, but the format is inferred from the output file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:168
+#: en/git-archive.txt:174
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:172
+#: en/git-archive.txt:178
#, priority:100
msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:173
+#: en/git-archive.txt:179
#, no-wrap, priority:100
msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:177
+#: en/git-archive.txt:183
#, priority:100
msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:178
+#: en/git-archive.txt:184
#, no-wrap, priority:100
msgid "`git archive -o latest.zip HEAD`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:183
+#: en/git-archive.txt:189
#, priority:100
msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:184
+#: en/git-archive.txt:190
#, no-wrap, priority:100
msgid "`git config tar.tar.xz.command \"xz -c\"`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:189
+#: en/git-archive.txt:195
#, priority:100
msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:194
+#: en/git-archive.txt:200
#, ignore-same, priority:100
msgid "linkgit:gitattributes[5]"
msgstr "linkgit:gitattributes[5]"
@@ -8022,8 +8093,8 @@ msgstr ""
#: en/git-bisect.txt:31
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-" git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n"
-"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
+" git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n"
+"\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n"
" git bisect (bad|new|<term-new>) [<rev>]\n"
" git bisect (good|old|<term-old>) [<rev>...]\n"
" git bisect terms [--term-good | --term-bad]\n"
@@ -8551,13 +8622,31 @@ msgid "If the repository is bare, `--no-checkout` is assumed."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:372
+#: en/git-bisect.txt:371
+#, priority:100
+msgid "Follow only the first parent commit upon seeing a merge commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:375
+#, priority:100
+msgid "In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:378
+#, priority:100
+msgid "This option is particularly useful in avoiding false positives when a merged branch contained broken or non-buildable commits, but the merge itself was OK."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:383
#, priority:100
msgid "Automatically bisect a broken build between v1.2 and HEAD:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:377
+#: en/git-bisect.txt:388
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good\n"
@@ -8566,13 +8655,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:380
+#: en/git-bisect.txt:391
#, priority:100
msgid "Automatically bisect a test failure between origin and HEAD:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:385
+#: en/git-bisect.txt:396
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD origin -- # HEAD is bad, origin is good\n"
@@ -8581,13 +8670,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:388 en/git-bisect.txt:442
+#: en/git-bisect.txt:399 en/git-bisect.txt:453
#, priority:100
msgid "Automatically bisect a broken test case:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:397
+#: en/git-bisect.txt:408
#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
@@ -8600,25 +8689,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:403
+#: en/git-bisect.txt:414
#, priority:100
msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:407
+#: en/git-bisect.txt:418
#, priority:100
msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:409
+#: en/git-bisect.txt:420
#, priority:100
msgid "Automatically bisect with temporary modifications (hot-fix):"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:413
+#: en/git-bisect.txt:424
#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
@@ -8626,7 +8715,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:426
+#: en/git-bisect.txt:437
#, no-wrap, priority:100
msgid ""
"# tweak the working tree by merging the hot-fix branch\n"
@@ -8644,7 +8733,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:429
+#: en/git-bisect.txt:440
#, no-wrap, priority:100
msgid ""
"# undo the tweak to allow clean flipping to the next commit\n"
@@ -8652,7 +8741,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:432
+#: en/git-bisect.txt:443
#, no-wrap, priority:100
msgid ""
"# return control\n"
@@ -8660,13 +8749,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:440
+#: en/git-bisect.txt:451
#, priority:100
msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:447
+#: en/git-bisect.txt:458
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n"
@@ -8675,19 +8764,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:451
+#: en/git-bisect.txt:462
#, priority:100
msgid "This shows that you can do without a run script if you write the test on a single line."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:453
+#: en/git-bisect.txt:464
#, priority:100
msgid "Locate a good region of the object graph in a damaged repository"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:463
+#: en/git-bisect.txt:474
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
@@ -8701,25 +8790,25 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:465
+#: en/git-bisect.txt:476
#, no-wrap, priority:100
msgid "$ git bisect reset # quit the bisect session\n"
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:470
+#: en/git-bisect.txt:481
#, priority:100
msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:472
+#: en/git-bisect.txt:483
#, priority:100
msgid "Look for a fix instead of a regression in the code"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:477
+#: en/git-bisect.txt:488
#, no-wrap, priority:100
msgid ""
"$ git bisect start\n"
@@ -8728,13 +8817,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:480
+#: en/git-bisect.txt:491
#, priority:100
msgid "or:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:484
+#: en/git-bisect.txt:495
#, no-wrap, priority:100
msgid ""
"$ git bisect start --term-old broken --term-new fixed\n"
@@ -8743,19 +8832,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-bisect.txt:487
+#: en/git-bisect.txt:498
#, no-wrap, priority:100
msgid "Getting help"
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:491
+#: en/git-bisect.txt:502
#, priority:100
msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:496
+#: en/git-bisect.txt:507
#, priority:100
msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]."
msgstr ""
@@ -9137,7 +9226,7 @@ msgid "For people who do parsing: to make it more robust, just ignore any lines
msgstr ""
#. type: Title -
-#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:83
+#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
#, no-wrap, priority:260
msgid "MAPPING AUTHORS"
msgstr ""
@@ -9161,8 +9250,8 @@ msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
"\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
-"\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
"\t[--points-at <object>] [--format=<format>]\n"
"\t[(-r | --remotes) | (-a | --all)]\n"
"\t[--list] [<pattern>...]\n"
@@ -9242,7 +9331,7 @@ msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, tha
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
+#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:179
#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
@@ -9320,7 +9409,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:615
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:634
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9344,7 +9433,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9566,121 +9655,121 @@ msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:257
+#: en/git-branch.txt:256
#, priority:240
-msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
+msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:258 en/git-tag.txt:154
+#: en/git-branch.txt:257 en/git-tag.txt:154
#, no-wrap, priority:240
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:262
+#: en/git-branch.txt:260
#, priority:240
-msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
+msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:263
+#: en/git-branch.txt:261
#, no-wrap, priority:240
msgid "<branchname>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:268
+#: en/git-branch.txt:266
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:269 en/git-switch.txt:42
+#: en/git-branch.txt:267 en/git-switch.txt:42
#, no-wrap, priority:240
msgid "<start-point>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:273
+#: en/git-branch.txt:271
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:274
+#: en/git-branch.txt:272
#, no-wrap, priority:240
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:276
+#: en/git-branch.txt:274
#, priority:240
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:277
+#: en/git-branch.txt:275
#, no-wrap, priority:240
msgid "<newbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:280
+#: en/git-branch.txt:278
#, priority:240
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
+#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
#, no-wrap, priority:240
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:291
+#: en/git-branch.txt:289
#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:293 en/git-tag.txt:158
+#: en/git-branch.txt:291 en/git-tag.txt:158
#, no-wrap, priority:240
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:295
+#: en/git-branch.txt:293
#, priority:240
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:296
+#: en/git-branch.txt:294
#, no-wrap, priority:240
msgid "--format <format>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:300
+#: en/git-branch.txt:298
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:306
+#: en/git-branch.txt:304
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:310
+#: en/git-branch.txt:308
#, no-wrap, priority:240
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:317
+#: en/git-branch.txt:315
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
@@ -9690,19 +9779,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:321
+#: en/git-branch.txt:319
#, priority:240
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:322
+#: en/git-branch.txt:320
#, no-wrap, priority:240
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:329
+#: en/git-branch.txt:327
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
@@ -9712,25 +9801,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:334
+#: en/git-branch.txt:332
#, priority:240
msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:336
+#: en/git-branch.txt:334
#, priority:240
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:337
+#: en/git-branch.txt:335
#, no-wrap, priority:240
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:342
+#: en/git-branch.txt:340
#, no-wrap, priority:240
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
@@ -9738,61 +9827,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:346
+#: en/git-branch.txt:344
#, priority:240
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:347
+#: en/git-branch.txt:345
#, priority:240
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:349
+#: en/git-branch.txt:347
#, priority:240
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:356
+#: en/git-branch.txt:354
#, priority:240
msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:359
+#: en/git-branch.txt:357
#, priority:240
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:363
+#: en/git-branch.txt:361
#, priority:240
msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:366
+#: en/git-branch.txt:364
#, priority:240
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:369
+#: en/git-branch.txt:367
#, priority:240
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:372
+#: en/git-branch.txt:370
#, priority:240
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
@@ -9882,43 +9971,49 @@ msgid "A list of enabled hooks"
msgstr ""
#. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
#, priority:100
msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
msgstr ""
#. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
#, no-wrap, priority:100
msgid "-o <path>"
msgstr ""
#. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
#, no-wrap, priority:100
msgid "--output-directory <path>"
msgstr ""
#. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
#, priority:100
msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
msgstr ""
#. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
#, no-wrap, priority:100
msgid "-s <format>"
msgstr ""
#. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
#, no-wrap, priority:100
msgid "--suffix <format>"
msgstr ""
#. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
#, priority:100
msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
@@ -9936,173 +10031,187 @@ msgid "git-bundle - Move objects and refs by archive"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:16
+#: en/git-bundle.txt:17
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]\n"
+"\t\t [--version=<version>] <file> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <file>\n"
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:24
+#: en/git-bundle.txt:25
#, priority:100
msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:29
+#: en/git-bundle.txt:30
#, priority:100
msgid "The 'git bundle' command packages objects and references in an archive at the originating machine, which can then be imported into another repository using 'git fetch', 'git pull', or 'git clone', after moving the archive by some means (e.g., by sneakernet)."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:35
+#: en/git-bundle.txt:36
#, priority:100
msgid "As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:39
+#: en/git-bundle.txt:40
#, no-wrap, priority:100
msgid "create [options] <file> <git-rev-list-args>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:44
+#: en/git-bundle.txt:45
#, priority:100
msgid "Used to create a bundle named 'file'. This requires the '<git-rev-list-args>' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:45
+#: en/git-bundle.txt:46
#, no-wrap, priority:100
msgid "verify <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:52
+#: en/git-bundle.txt:53
#, priority:100
msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. 'git bundle' prints a list of missing commits, if any, and exits with a non-zero status."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:53
+#: en/git-bundle.txt:54
#, no-wrap, priority:100
msgid "list-heads <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:57
+#: en/git-bundle.txt:58
#, priority:100
msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:58
+#: en/git-bundle.txt:59
#, no-wrap, priority:100
msgid "unbundle <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:64
+#: en/git-bundle.txt:65
#, priority:100
msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:65
+#: en/git-bundle.txt:66
#, no-wrap, priority:100
msgid "<git-rev-list-args>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:74
+#: en/git-bundle.txt:75
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:76
+#: en/git-bundle.txt:77
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:82
+#: en/git-bundle.txt:83
#, priority:100
msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:89 en/git-pack-objects.txt:157
+#: en/git-bundle.txt:90 en/git-pack-objects.txt:157
#, ignore-same, no-wrap, priority:100
msgid "--all-progress"
msgstr "--all-progress"
#. type: Plain text
-#: en/git-bundle.txt:99 en/git-pack-objects.txt:167
+#: en/git-bundle.txt:100 en/git-pack-objects.txt:167
#, priority:100
msgid "When --stdout is specified then progress report is displayed during the object count and compression phases but inhibited during the write-out phase. The reason is that in some cases the output stream is directly linked to another command which may wish to display progress status of its own as it processes incoming pack data. This flag is like --progress except that it forces progress report for the write-out phase as well even if --stdout is used."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:100 en/git-pack-objects.txt:168
+#: en/git-bundle.txt:101 en/git-pack-objects.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
#. type: Plain text
-#: en/git-bundle.txt:104 en/git-pack-objects.txt:172
+#: en/git-bundle.txt:105 en/git-pack-objects.txt:172
#, priority:100
msgid "This is used to imply --all-progress whenever progress display is activated. Unlike --all-progress this flag doesn't actually force any progress display by itself."
msgstr ""
+#. type: Labeled list
+#: en/git-bundle.txt:106
+#, fuzzy, no-wrap, priority:100
+#| msgid "--server-option=<option>"
+msgid "--version=<version>"
+msgstr "--server-option=<valmöguleiki>"
+
+#. type: Plain text
+#: en/git-bundle.txt:111
+#, priority:100
+msgid "Specify the bundle version. Version 2 is the older format and can only be used with SHA-1 repositories; the newer version 3 contains capabilities that permit extensions. The default is the oldest supported format, based on the hash algorithm in use."
+msgstr ""
+
#. type: Plain text
-#: en/git-bundle.txt:109 en/git-pack-objects.txt:176
+#: en/git-bundle.txt:116 en/git-pack-objects.txt:176
#, priority:100
msgid "This flag makes the command not to report its progress on the standard error stream."
msgstr ""
#. type: Title -
-#: en/git-bundle.txt:111
+#: en/git-bundle.txt:118
#, no-wrap, priority:100
msgid "SPECIFYING REFERENCES"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:121
+#: en/git-bundle.txt:128
#, priority:100
msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads. References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:126
+#: en/git-bundle.txt:133
#, priority:100
msgid "It is very important that the basis used be held by the destination. It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:134
+#: en/git-bundle.txt:141
#, priority:100
msgid "`git clone` can use any bundle created without negative refspecs (e.g., `new`, but not `old..new`). If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:143
+#: en/git-bundle.txt:150
#, priority:100
msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:148
+#: en/git-bundle.txt:155
#, priority:100
msgid "To bootstrap the process, you can first create a bundle that does not have any basis. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:153
+#: en/git-bundle.txt:160
#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
@@ -10111,25 +10220,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:158
+#: en/git-bundle.txt:165
#, priority:100
msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:161
+#: en/git-bundle.txt:168
#, no-wrap, priority:100
msgid "machineB$ git clone -b master /home/me/tmp/file.bundle R2\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:166
+#: en/git-bundle.txt:173
#, priority:100
msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:171
+#: en/git-bundle.txt:178
#, no-wrap, priority:100
msgid ""
"[remote \"origin\"]\n"
@@ -10138,19 +10247,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:176
+#: en/git-bundle.txt:183
#, priority:100
msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:179
+#: en/git-bundle.txt:186
#, priority:100
msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:184
+#: en/git-bundle.txt:191
#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
@@ -10159,13 +10268,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:188
+#: en/git-bundle.txt:195
#, priority:100
msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:192
+#: en/git-bundle.txt:199
#, no-wrap, priority:100
msgid ""
"machineB$ cd R2\n"
@@ -10173,85 +10282,85 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:200
+#: en/git-bundle.txt:207
#, priority:100
msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the basis, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:202
+#: en/git-bundle.txt:209
#, priority:100
msgid "You can use a tag that is present in both:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:205
+#: en/git-bundle.txt:212
#, no-wrap, priority:100
msgid "$ git bundle create mybundle v1.0.0..master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:208
+#: en/git-bundle.txt:215
#, priority:100
msgid "You can use a basis based on time:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:211
+#: en/git-bundle.txt:218
#, no-wrap, priority:100
msgid "$ git bundle create mybundle --since=10.days master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:214
+#: en/git-bundle.txt:221
#, priority:100
msgid "You can use the number of commits:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:217
+#: en/git-bundle.txt:224
#, no-wrap, priority:100
msgid "$ git bundle create mybundle -10 master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:221
+#: en/git-bundle.txt:228
#, priority:100
msgid "You can run `git-bundle verify` to see if you can extract from a bundle that was created with a basis:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:224
+#: en/git-bundle.txt:231
#, no-wrap, priority:100
msgid "$ git bundle verify mybundle\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:228
+#: en/git-bundle.txt:235
#, priority:100
msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:232
+#: en/git-bundle.txt:239
#, priority:100
msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:235
+#: en/git-bundle.txt:242
#, no-wrap, priority:100
msgid "$ git fetch mybundle master:localRef\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:238
+#: en/git-bundle.txt:245
#, priority:100
msgid "You can also see what references it offers:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:241
+#: en/git-bundle.txt:248
#, no-wrap, priority:100
msgid "$ git ls-remote mybundle\n"
msgstr ""
@@ -10273,7 +10382,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
msgstr ""
#. type: Plain text
@@ -10289,7 +10398,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:346
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10325,7 +10434,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:363
+#: en/git-cat-file.txt:52 en/git.txt:370
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10544,7 +10653,7 @@ msgid ""
msgstr ""
#. 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:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: 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:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10806,19 +10915,19 @@ msgid "is printed when, during symlink resolution, a file is used as a directory
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:375 en/git-svn.txt:999
+#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:396 en/git-svn.txt:999
#, no-wrap, priority:100
msgid "CAVEATS"
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
+#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:404
#, priority:100
msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
+#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:408
#, priority:100
msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
msgstr ""
@@ -10868,7 +10977,7 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
@@ -11396,7 +11505,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-checkout.txt:356 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11837,7 +11946,7 @@ msgid "If `<branch>` is not found but there does exist a tracking branch in exac
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
+#: en/git-checkout.txt:194 en/git-switch.txt:104
#, priority:240
msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
msgstr ""
@@ -11855,265 +11964,265 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:180
#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
#. type: Plain text
-#: en/git-checkout.txt:207
+#: en/git-checkout.txt:208
#, priority:240
msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:208
+#: en/git-checkout.txt:209
#, no-wrap, priority:240
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:214
+#: en/git-checkout.txt:215
#, priority:240
msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:219
+#: en/git-checkout.txt:220
#, priority:240
msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:225
+#: en/git-checkout.txt:226
#, priority:240
msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:232
+#: en/git-checkout.txt:233
#, priority:240
msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:233 en/git-restore.txt:100
+#: en/git-checkout.txt:234 en/git-restore.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
-#: en/git-checkout.txt:238
+#: en/git-checkout.txt:239
#, priority:240
msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:347 en/git-rebase.txt:619 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
#. type: Plain text
-#: en/git-checkout.txt:249
+#: en/git-checkout.txt:250
#, priority:240
msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:254 en/git-switch.txt:132
+#: en/git-checkout.txt:255 en/git-switch.txt:132
#, priority:240
msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:257
+#: en/git-checkout.txt:258
#, priority:240
msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:259
+#: en/git-checkout.txt:260
#, priority:240
msgid "When switching branches with `--merge`, staged changes may be lost."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:260 en/git-restore.txt:87 en/git-switch.txt:133
+#: en/git-checkout.txt:261 en/git-restore.txt:87 en/git-switch.txt:133
#, no-wrap, priority:240
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:266 en/git-restore.txt:93 en/git-switch.txt:139
+#: en/git-checkout.txt:267 en/git-restore.txt:93 en/git-switch.txt:139
#, priority:240
msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:273
+#: en/git-checkout.txt:274
#, priority:240
msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:277
+#: en/git-checkout.txt:278
#, priority:240
msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:280
+#: en/git-checkout.txt:281
#, priority:240
msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:281 en/git-switch.txt:175
+#: en/git-checkout.txt:282 en/git-switch.txt:175
#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
-#: en/git-checkout.txt:286
+#: en/git-checkout.txt:287
#, priority:240
msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:287 en/git-merge.txt:90
+#: en/git-checkout.txt:288 en/git-merge.txt:90
#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr "--overwrite-ignore"
#. type: Labeled list
-#: en/git-checkout.txt:288 en/git-merge.txt:91
+#: en/git-checkout.txt:289 en/git-merge.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr "--no-overwrite-ignore"
#. type: Plain text
-#: en/git-checkout.txt:292
+#: en/git-checkout.txt:293
#, priority:240
msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:293 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
+#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
#. type: Plain text
-#: en/git-checkout.txt:302
+#: en/git-checkout.txt:303
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:303 en/git-restore.txt:118
+#: en/git-checkout.txt:304 en/git-restore.txt:118
#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
-#: en/git-checkout.txt:304 en/git-restore.txt:119
+#: en/git-checkout.txt:305 en/git-restore.txt:119
#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr "--no-overlay"
#. type: Plain text
-#: en/git-checkout.txt:310
+#: en/git-checkout.txt:311
#, priority:240
msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:324 en/git-rebase.txt:243 en/git-switch.txt:36
+#: en/git-checkout.txt:325 en/git-rebase.txt:244 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:330
+#: en/git-checkout.txt:331
#, priority:240
msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:334
+#: en/git-checkout.txt:335
#, priority:240
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:338 en/git-switch.txt:58
+#: en/git-checkout.txt:339 en/git-switch.txt:58
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:339
+#: en/git-checkout.txt:340
#, no-wrap, priority:240
msgid "<new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:341 en/git-switch.txt:41
+#: en/git-checkout.txt:342 en/git-switch.txt:41
#, priority:240
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:342
+#: en/git-checkout.txt:343
#, no-wrap, priority:240
msgid "<start_point>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:345
+#: en/git-checkout.txt:346
#, priority:240
msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:349
+#: en/git-checkout.txt:350
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:353
+#: en/git-checkout.txt:354
#, priority:240
msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:359 en/git-reset.txt:130 en/git-restore.txt:143
+#: en/git-checkout.txt:360 en/git-reset.txt:130 en/git-restore.txt:143
#, priority:280
msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
+#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:363
+#: en/git-checkout.txt:364
#, no-wrap, priority:240
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:367
+#: en/git-checkout.txt:368
#, priority:240
msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:376
+#: en/git-checkout.txt:377
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12126,19 +12235,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:383
+#: en/git-checkout.txt:384
#, priority:240
msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
+#: en/git-checkout.txt:387 en/git-checkout.txt:422 en/git-checkout.txt:439
#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:394
+#: en/git-checkout.txt:395
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12151,13 +12260,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:400
+#: en/git-checkout.txt:401
#, priority:240
msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:404
+#: en/git-checkout.txt:405
#, no-wrap, priority:240
msgid ""
"$ git checkout v2.0 # or\n"
@@ -12165,7 +12274,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:412
+#: en/git-checkout.txt:413
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'b')\n"
@@ -12178,13 +12287,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:418
+#: en/git-checkout.txt:419
#, priority:240
msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:431
+#: en/git-checkout.txt:432
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'e')\n"
@@ -12199,13 +12308,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:435
+#: en/git-checkout.txt:436
#, priority:240
msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:448
+#: en/git-checkout.txt:449
#, no-wrap, priority:240
msgid ""
"\t HEAD (refers to commit 'f')\n"
@@ -12220,19 +12329,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:452
+#: en/git-checkout.txt:453
#, priority:240
msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:455
+#: en/git-checkout.txt:456
#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:463
+#: en/git-checkout.txt:464
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12245,13 +12354,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:470
+#: en/git-checkout.txt:471
#, priority:240
msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:475
+#: en/git-checkout.txt:476
#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
@@ -12260,31 +12369,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:480
+#: en/git-checkout.txt:481
#, priority:240
msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:483
+#: en/git-checkout.txt:484
#, priority:240
msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:486
+#: en/git-checkout.txt:487
#, priority:240
msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:491
+#: en/git-checkout.txt:492
#, priority:240
msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:495
+#: en/git-checkout.txt:496
#, no-wrap, priority:240
msgid ""
"$ git reflog -2 HEAD # or\n"
@@ -12292,25 +12401,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:498
+#: en/git-checkout.txt:499
#, no-wrap, priority:240
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:508
+#: en/git-checkout.txt:509
#, priority:240
msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:515
+#: en/git-checkout.txt:516
#, priority:240
msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:521
+#: en/git-checkout.txt:522
#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
@@ -12320,73 +12429,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:524
+#: en/git-checkout.txt:525
#, priority:240
msgid "switch branch"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:525 en/git-restore.txt:161
+#: en/git-checkout.txt:526 en/git-restore.txt:161
#, priority:240
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:526
+#: en/git-checkout.txt:527
#, priority:240
msgid "restore `hello.c` from the index"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:529
+#: en/git-checkout.txt:530
#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:532
+#: en/git-checkout.txt:533
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:538
+#: en/git-checkout.txt:539
#, priority:240
msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:542
+#: en/git-checkout.txt:543
#, priority:240
msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:545
+#: en/git-checkout.txt:546
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:549 en/git-switch.txt:201
+#: en/git-checkout.txt:550 en/git-switch.txt:201
#, priority:240
msgid "After working in the wrong branch, switching to the correct branch would be done using:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:552
+#: en/git-checkout.txt:553
#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:557
+#: en/git-checkout.txt:558
#, priority:240
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:561
+#: en/git-checkout.txt:562
#, no-wrap, priority:240
msgid ""
"$ git checkout mytopic\n"
@@ -12394,13 +12503,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:565 en/git-switch.txt:217
+#: en/git-checkout.txt:566 en/git-switch.txt:217
#, priority:240
msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:569
+#: en/git-checkout.txt:570
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12408,19 +12517,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:574 en/git-switch.txt:226
+#: en/git-checkout.txt:575 en/git-switch.txt:226
#, priority:240
msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:577
+#: en/git-checkout.txt:578
#, priority:240
msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:583
+#: en/git-checkout.txt:584
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12430,13 +12539,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:589
+#: en/git-checkout.txt:590
#, priority:240
msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:593
+#: en/git-checkout.txt:594
#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
@@ -12444,7 +12553,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:599
+#: en/git-checkout.txt:600
#, ignore-same, priority:240
msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
@@ -12831,7 +12940,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:327 en/git-rebase.txt:622
+#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328 en/git-rebase.txt:641
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12855,7 +12964,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:361 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
+#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13069,7 +13178,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:238
+#: en/git-cherry.txt:32 en/git-rebase.txt:239
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -13081,13 +13190,13 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:383
+#: en/git-cherry.txt:36 en/git.txt:390
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:245
+#: en/git-cherry.txt:38 en/git-rebase.txt:246
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -13575,7 +13684,17 @@ msgstr "Þegar hirslan sem á að einrita er á staðbundinni vél, setjið sjá
#. type: Plain text
#: en/git-clone.txt:84
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "*NOTE*: this is a possibly dangerous operation; do *not* use\n"
+#| "it unless you understand what it does. If you clone your\n"
+#| "repository using this option and then delete branches (or use any\n"
+#| "other Git command that makes any existing commit unreferenced) in the\n"
+#| "source repository, some objects may become unreferenced (or dangling).\n"
+#| "These objects may be removed by normal Git operations (such as `git commit`)\n"
+#| "which automatically call `git gc --auto`. (See linkgit:git-gc[1].)\n"
+#| "If these objects are removed and were referenced by the cloned repository,\n"
+#| "then the cloned repository will become corrupt.\n"
msgid ""
"*NOTE*: this is a possibly dangerous operation; do *not* use\n"
"it unless you understand what it does. If you clone your\n"
@@ -13583,9 +13702,9 @@ msgid ""
"other Git command that makes any existing commit unreferenced) in the\n"
"source repository, some objects may become unreferenced (or dangling).\n"
"These objects may be removed by normal Git operations (such as `git commit`)\n"
-"which automatically call `git gc --auto`. (See linkgit:git-gc[1].)\n"
-"If these objects are removed and were referenced by the cloned repository,\n"
-"then the cloned repository will become corrupt.\n"
+"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\n"
"hana nema þú vitir hvað hún gerir. Ef þú einritar hirsluna þína\n"
@@ -13668,7 +13787,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
msgstr "Endurupptaka HAUS er ekki framkvæmd eftir að einritið er fullgert."
#. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
#, ignore-same, no-wrap, priority:300
msgid "--bare"
msgstr "--bare"
@@ -13680,7 +13799,7 @@ msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>`
msgstr "Þessi valmöguleiki býr til 'nakta' Git hirslu. Það er að segja, í stað þess að búa til `<skrá>` og setja stjórnunarskrárnar í `<skrá>/git.` gerir hann `<skrá>` sjálfa `$GIT_DIR`skrána. Þetta felur augljóslega í sér `--no-checkout`(engin endurupptaka) vegna þess að það er ekki neinn staður til þar sem hægt er að endurupptaka verktréð. Einnig eru greinahausarnir sem eru fjarlægir afritaðir beint yfir í samsvarandi staðbundna greinahausa, án þess að kortleggja þá í `refs/remotes/origin/`(tilvísanir fjarlægjur uppruni). Þegar þessi valmöguleiki er notaður eru hvorki búnar til greinarnar sem eru undir fjareftirliti né tilheyrandi stillingabreytur."
#. type: Labeled list
-#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
+#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490
#, ignore-same, no-wrap, priority:300
msgid "--sparse"
msgstr "--sparse"
@@ -13692,7 +13811,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr "Frumstillir sparlega endurupptöku skjala svo að verkskráin byrjar einungis með þau skjöl sem eru í rót hirslunnar. Sparleg endurupptaka getur verið stillt til þess að stækka verkskrána eins og þörf er á."
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:869
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<síutilgreiningar>"
@@ -13764,7 +13883,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
msgstr "Þegar þessi valmöguleiki er uppgefinn, og aðgangur að hirslunni sem á að afrita er í gegn um ssh (secure shell, öryggisskel), þá skilgreinir hann óforstillta slóð fyrir skipunina sem framkvæmd er á hinum endanum."
#. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:59 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
msgstr "--template=<sniðmót_skrá>"
@@ -13849,8 +13968,9 @@ msgstr "Hægt er að nota þennan valmöguleika í samfloti við `--single-branc
#. type: Labeled list
#: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
msgstr "--recurse-submodules[=<slóðatilgreining]"
#. type: Plain text
@@ -13890,7 +14010,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
msgstr "Allar undirverkeiningar sem eru einritðaðar nota stöðu viðeigandi greinar undir fjareftirliti til þess að uppfæra undirverkeininguna, fremur en skráða SHA-1 öryggisundirskrift yfirverksins. Jafngildir því að gefa upp `--remote`(fjarlægja) með `git submodule update` (undirverkeining uppfæra)."
#. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:64
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
msgstr "--separate-git-dir=<git skrá>"
@@ -14228,7 +14348,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:345
+#: en/git-commit-tree.txt:47 en/git.txt:352
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14643,7 +14763,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:412 en/merge-options.txt:115
+#: en/git-commit.txt:176 en/git-rebase.txt:413 en/merge-options.txt:115
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -15821,7 +15941,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358 en/git.txt:324
+#: en/git-config.txt:358 en/git.txt:331
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -16042,7 +16162,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 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:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:413
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
@@ -16988,16 +17108,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -17467,7 +17581,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
msgstr ""
#. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
#, no-wrap, priority:100
msgid "LIMITATIONS"
msgstr ""
@@ -18793,12 +18907,6 @@ msgstr "--always"
msgid "Show uniquely abbreviated commit object as fallback."
msgstr ""
-#. type: Labeled list
-#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, ignore-same, no-wrap, priority:260
-msgid "--first-parent"
-msgstr "--first-parent"
-
#. type: Plain text
#: en/git-describe.txt:125
#, priority:260
@@ -18942,19 +19050,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:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:112
#, no-wrap, priority:280
msgid "-1 --base"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:113
#, no-wrap, priority:280
msgid "-2 --ours"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:114
#, no-wrap, priority:280
msgid "-3 --theirs"
msgstr ""
@@ -18972,7 +19080,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/git-log.txt:137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19323,7 +19431,7 @@ msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the c
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:264
+#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:263
#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr "-g"
@@ -19524,7 +19632,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:126 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19620,13 +19728,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
+#: en/git-diff-tree.txt:108 en/git-log.txt:143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
+#: en/git-diff-tree.txt:114 en/git-log.txt:149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19650,156 +19758,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <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 ""
#. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
#, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
#, priority:280
msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
#, no-wrap, priority:280
msgid "'git diff' [<options>] --no-index [--] <path> <path>"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
#, priority:280
msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
#, priority:280
msgid "This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
#, priority:280
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: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
#, priority:280
msgid "This is to view the changes between two arbitrary <commit>."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:74
+#, 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`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:75
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:81
#, 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 ""
#. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:82
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:89
#, 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:82
+#: en/git-diff.txt:94
#, 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>."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:101
#, 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:90
+#: en/git-diff.txt:102
#, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:106
#, 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:108
+#: en/git-diff.txt:120
#, 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:113
+#: en/git-diff.txt:125
#, 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:118
+#: en/git-diff.txt:130
#, 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:125
+#: en/git-diff.txt:137
#, no-wrap, priority:280
msgid "Various ways to check your working tree"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:143
#, no-wrap, priority:280
msgid ""
"$ git diff <1>\n"
@@ -19808,31 +19929,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:146
#, priority:280
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:148
#, 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:138
+#: en/git-diff.txt:150
#, 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:139
+#: en/git-diff.txt:151
#, no-wrap, priority:280
msgid "Comparing with arbitrary commits"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:157
#, no-wrap, priority:280
msgid ""
"$ git diff test <1>\n"
@@ -19841,31 +19962,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:161
#, 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:152
+#: en/git-diff.txt:164
#, 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:153
+#: en/git-diff.txt:165
#, priority:280
msgid "Compare the version before the last commit and the last commit."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:166
#, no-wrap, priority:280
msgid "Comparing branches"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:172
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
@@ -19874,31 +19995,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:175
#, priority:280
msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:176 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:166
+#: en/git-diff.txt:178
#, 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:167
+#: en/git-diff.txt:179
#, no-wrap, priority:280
msgid "Limiting the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:185
#, no-wrap, priority:280
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
@@ -19907,31 +20028,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:189
#, priority:280
msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:191
#, priority:280
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:192
#, priority:280
msgid "Limit diff output to named subtrees."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:193
#, no-wrap, priority:280
msgid "Munging the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:198
#, no-wrap, priority:280
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
@@ -19939,22 +20060,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:202
#, priority:280
msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:203
#, priority:280
msgid "Output diff in reverse."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:213
+#, 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]"
+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-fast-export.txt:2
@@ -20150,78 +20272,90 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
#, ignore-same, no-wrap, priority:100
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
#. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
#, priority:100
msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files). Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum. Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
#, ignore-same, no-wrap, priority:100
msgid "--show-original-ids"
msgstr "--show-original-ids"
#. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
#, priority:100
msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`. While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
#, no-wrap, priority:100
msgid "--reencode=(yes|no|abort)"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
#, priority:100
msgid "Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit message will be re-encoded into UTF-8. With 'no', the original encoding will be preserved."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
#, ignore-same, no-wrap, priority:100
msgid "--refspec"
msgstr "--refspec"
#. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
#, priority:100
msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<git-rev-list-args>...]"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export. For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
#, no-wrap, priority:100
msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
#, priority:100
msgid "This will export the whole repository and import it into the existing empty repository. Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
#, no-wrap, priority:100
msgid ""
"$ git fast-export master~5..master |\n"
@@ -20230,55 +20364,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
#, priority:100
msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
#, priority:100
msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
#, no-wrap, priority:100
msgid "ANONYMIZING"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
#, priority:100
msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data. Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
#, priority:100
msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
#, no-wrap, priority:100
msgid "$ git fast-export --anonymize --all >anon-stream\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
#, priority:100
msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git init anon-repo\n"
@@ -20288,25 +20422,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
#, priority:100
msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
#, no-wrap, priority:100
msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
msgstr ""
#. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+" --anonymize-map=sensitive:foo \\\n"
+" --anonymize-map=secret.c:bar.c \\\n"
+" >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries. The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
#, priority:100
msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
msgstr ""
@@ -20497,16 +20665,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -20744,259 +20906,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
#, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed. This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
#, no-wrap, priority:100
msgid "`rfc2822`"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
#, priority:100
msgid "This is the standard email format as described by RFC 2822."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
#, priority:100
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
#, priority:100
msgid "Some malformed strings may be accepted as valid dates. In some of these cases Git will still be able to obtain the correct date from the malformed string. There are also some types of malformed strings which Git will parse wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
#, priority:100
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
#, priority:100
msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
#, priority:100
msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
#, ignore-same, no-wrap, priority:100
msgid "`now`"
msgstr "`now`"
#. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
#, priority:100
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
#, priority:100
msgid "This is a toy format. The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import. There is no way to specify a different time or time zone."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
#, priority:100
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
#, priority:100
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
#, no-wrap, priority:100
msgid "Commands"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
#, priority:100
msgid "fast-import accepts several commands to update the current repository and control the current import process. More detailed discussion (with examples) of each command follows later."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
#, ignore-same, no-wrap, priority:100
msgid "`commit`"
msgstr "`commit`"
#. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
#, priority:100
msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
#, ignore-same, no-wrap, priority:100
msgid "`tag`"
msgstr "`tag`"
#. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
#, priority:100
msgid "Creates an annotated tag object from an existing commit or branch. Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
#, ignore-same, no-wrap, priority:100
msgid "`reset`"
msgstr "`reset`"
#. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
#, priority:100
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
#, ignore-same, no-wrap, priority:100
msgid "`blob`"
msgstr "`blob`"
#. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
#, priority:100
msgid "Convert raw file data into a blob, for future use in a `commit` command. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
#, ignore-same, no-wrap, priority:100
msgid "`alias`"
msgstr "`alias`"
#. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
#, priority:100
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
#, ignore-same, no-wrap, priority:100
msgid "`checkpoint`"
msgstr "`checkpoint`"
#. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
#, priority:100
msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
#, ignore-same, no-wrap, priority:100
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
#, priority:100
msgid "Causes fast-import to echo the entire line to its own standard output. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
#, ignore-same, no-wrap, priority:100
msgid "`done`"
msgstr "`done`"
#. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
#, ignore-same, no-wrap, priority:100
msgid "`get-mark`"
msgstr "`get-mark`"
#. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
#, ignore-same, no-wrap, priority:100
msgid "`cat-blob`"
msgstr "`cat-blob`"
#. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
#, priority:100
msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
#, ignore-same, no-wrap, priority:100
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
#, priority:100
msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
#, ignore-same, no-wrap, priority:100
msgid "`feature`"
msgstr "`feature`"
#. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
#, priority:100
msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
#, ignore-same, no-wrap, priority:100
msgid "`option`"
msgstr "`option`"
#. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
#, priority:100
msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
#, priority:100
msgid "Create or update a branch with a new commit, recording one logical change to the project."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
#, no-wrap, priority:100
msgid ""
"\t'commit' SP <ref> LF\n"
@@ -21013,241 +21187,241 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
#, priority:100
msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format). It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
#, ignore-same, no-wrap, priority:100
msgid "`author`"
msgstr "`author`"
#. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
#, priority:100
msgid "An `author` command may optionally appear, if the author information might differ from the committer information. If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit. See below for a description of the fields in `author`, as they are identical to `committer`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
#, ignore-same, no-wrap, priority:100
msgid "`committer`"
msgstr "`committer`"
#. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
#, priority:100
msgid "The `committer` command indicates who made this commit, and when they made it."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
#, priority:100
msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com''). `LT` and `GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. These are required to delimit the email address from the other fields in the line. Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
#, ignore-same, no-wrap, priority:100
msgid "`encoding`"
msgstr "`encoding`"
#. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
#, priority:100
msgid "The optional `encoding` command indicates the encoding of the commit message. Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
#, ignore-same, no-wrap, priority:100
msgid "`from`"
msgstr "`from`"
#. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
#, priority:100
msgid "The `from` command is used to specify the commit to initialize this branch from. This revision will be the first ancestor of the new commit. The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
#, priority:100
msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
#, priority:100
msgid "Here `<commit-ish>` is any of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
#, priority:100
msgid "The name of an existing branch already in fast-import's internal branch table. If fast-import doesn't know the name, it's treated as a SHA-1 expression."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
#, priority:100
msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
#, priority:100
msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
#, priority:100
msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
msgstr ""
#. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
#, no-wrap, priority:100
msgid "\tfrom refs/heads/branch^0\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
#, ignore-same, no-wrap, priority:100
msgid "`merge`"
msgstr "`merge`"
#. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
#, priority:100
msgid "Includes one additional ancestor commit. The additional ancestry link does not change the way the tree state is built at this commit. If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files. An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
#, priority:100
msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
#, ignore-same, no-wrap, priority:100
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
#, priority:100
msgid "Included in a `commit` command to add a new file or change the content of an existing file. This command has two different means of specifying the content of the file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
#, no-wrap, priority:100
msgid "External data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
#, no-wrap, priority:100
msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
#, priority:100
msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object. If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
#, no-wrap, priority:100
msgid "Inline data format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
#, no-wrap, priority:100
msgid ""
"\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21255,259 +21429,259 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
#, priority:100
msgid "See below for a detailed description of the `data` command."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
#, priority:100
msgid "In both formats `<mode>` is the type of file entry, specified in octal. Git only supports the following modes:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
#, priority:100
msgid "`100755` or `755`: A normal, but executable, file."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
#, priority:100
msgid "`120000`: A symlink, the content of the file will be the link target."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
#, priority:100
msgid "`040000`: A subdirectory. Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
#, priority:100
msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
#, priority:100
msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
#, priority:100
msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
#, priority:100
msgid "The value of `<path>` must be in canonical form. That is it must not:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
#, priority:100
msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
#, priority:100
msgid "end with a directory separator (e.g. `foo/` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
#, priority:100
msgid "start with a directory separator (e.g. `/foo` is invalid),"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
#, priority:100
msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
#, priority:100
msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
#, ignore-same, no-wrap, priority:100
msgid "`filedelete`"
msgstr "`filedelete`"
#. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
#, no-wrap, priority:100
msgid "\t'D' SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
#, ignore-same, no-wrap, priority:100
msgid "`filecopy`"
msgstr "`filecopy`"
#. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
#, no-wrap, priority:100
msgid "\t'C' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
#, priority:100
msgid "here the first `<path>` is the source location and the second `<path>` is the destination. See `filemodify` above for a detailed description of what `<path>` may look like. To use a source path that contains SP the path must be quoted."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
#, priority:100
msgid "A `filecopy` command takes effect immediately. Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
#, ignore-same, no-wrap, priority:100
msgid "`filerename`"
msgstr "`filerename`"
#. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
#, no-wrap, priority:100
msgid "\t'R' SP <path> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
#, priority:100
msgid "A `filerename` command takes effect immediately. Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
#, ignore-same, no-wrap, priority:100
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
#. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
#, no-wrap, priority:100
msgid "\t'deleteall' LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
#, priority:100
msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
#, priority:100
msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands. The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
#, ignore-same, no-wrap, priority:100
msgid "`notemodify`"
msgstr "`notemodify`"
#. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
#, priority:100
msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
#, no-wrap, priority:100
msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
#, priority:100
msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
#, no-wrap, priority:100
msgid ""
"\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21515,73 +21689,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
#, priority:100
msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
#, ignore-same, no-wrap, priority:100
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
#, priority:100
msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1. Here the current object is the object creation command the `mark` command appears within. This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
#, no-wrap, priority:100
msgid "\t'mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
#, priority:100
msgid "New marks are created automatically. Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
#, ignore-same, no-wrap, priority:100
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
#, priority:100
msgid "Provides the name of the object in the original source control system. fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
#, no-wrap, priority:100
msgid "\t'original-oid' SP <object-identifier> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
#, priority:100
-msgid "where `<object-identifer>` is any string not containing LF."
+msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
#, priority:100
msgid "Creates an annotated tag referring to a specific commit. To create lightweight (non-annotated) tags see the `reset` command below."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
#, no-wrap, priority:100
msgid ""
"\t'tag' SP <name> LF\n"
@@ -21593,55 +21767,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
#, priority:100
msgid "where `<name>` is the name of the tag to create."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
#, priority:100
msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
#, priority:100
msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
#, priority:100
msgid "The `from` command is the same as in the `commit` command; see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
#, priority:100
msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
#, priority:100
msgid "Signing annotated tags during import from within fast-import is not supported. Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature. If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
#, priority:100
msgid "Creates (or recreates) the named branch, optionally starting from a specific revision. The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
#, no-wrap, priority:100
msgid ""
"\t'reset' SP <ref> LF\n"
@@ -21650,25 +21824,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
#, priority:100
msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
#, priority:100
msgid "The `LF` after the command is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
#, priority:100
msgid "The `reset` command can also be used to create lightweight (non-annotated) tags. For example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
#, no-wrap, priority:100
msgid ""
"\treset refs/tags/938\n"
@@ -21676,19 +21850,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
#, priority:100
msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
#, priority:100
msgid "Requests writing one file revision to the packfile. The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
#, no-wrap, priority:100
msgid ""
"\t'blob' LF\n"
@@ -21698,43 +21872,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
#, priority:100
msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
#, ignore-same, no-wrap, priority:100
msgid "`data`"
msgstr "`data`"
#. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
#, priority:100
msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import. This makes it safe to import any file/message content whose lines might start with `#`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
#, no-wrap, priority:100
msgid "Exact byte count format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
#, priority:100
msgid "The frontend must specify the number of bytes of data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
#, no-wrap, priority:100
msgid ""
"\t'data' SP <count> LF\n"
@@ -21742,31 +21916,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
#, priority:100
msgid "where `<count>` is the exact number of bytes appearing within `<raw>`. The value of `<count>` is expressed as an ASCII decimal integer. The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
#, priority:100
msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended. Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
#, no-wrap, priority:100
msgid "Delimited format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
#, no-wrap, priority:100
msgid ""
"\t'data' SP '<<' <delim> LF\n"
@@ -21776,25 +21950,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
#, priority:100
msgid "where `<delim>` is the chosen delimiter string. The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does. The `LF` immediately trailing `<raw>` is part of `<raw>`. This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
#, priority:100
msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
#, priority:100
msgid "Record that a mark refers to a given object without first creating any new object."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
#, no-wrap, priority:100
msgid ""
"\t'alias' LF\n"
@@ -21804,19 +21978,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
#, priority:100
msgid "For a detailed description of `<commit-ish>` see above under `from`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
#, priority:100
msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
#, no-wrap, priority:100
msgid ""
"\t'checkpoint' LF\n"
@@ -21824,31 +21998,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
#, priority:100
msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
#, priority:100
msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch. However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
#, priority:100
msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream. The command otherwise has no impact on the current import, or on any of fast-import's internal state."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
#, no-wrap, priority:100
msgid ""
"\t'progress' SP <any> LF\n"
@@ -21856,67 +22030,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
#, priority:100
msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`. The `LF` after the command is optional. Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
#, no-wrap, priority:100
msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
#, priority:100
msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
#, priority:100
msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
#, no-wrap, priority:100
msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
#, priority:100
msgid "See ``Responses To Commands'' below for details about how to read this output safely."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
#, priority:100
msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
#, no-wrap, priority:100
msgid "\t'cat-blob' SP <dataref> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
#, priority:100
msgid "The `<dataref>` can be either a mark reference (`:<idnum>`) set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
#, priority:100
msgid "Output uses the same format as `git cat-file --batch`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
#, no-wrap, priority:100
msgid ""
"\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21924,283 +22098,283 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
#, priority:100
msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit. For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
#, priority:100
msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument. This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
#, priority:100
msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
#, no-wrap, priority:100
msgid "Reading from the active commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
#, no-wrap, priority:100
msgid "\t'ls' SP <path> LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
#, no-wrap, priority:100
msgid "Reading from a named tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
#, no-wrap, priority:100
msgid "\t'ls' SP <dataref> SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
#, priority:100
msgid "See `filemodify` above for a detailed description of `<path>`."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
#, priority:100
msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
#, no-wrap, priority:100
msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
#, priority:100
msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
#, no-wrap, priority:100
msgid "\tmissing SP <path> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
#, priority:100
msgid "Require that fast-import supports the specified feature, or abort if it does not."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
#, no-wrap, priority:100
msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
#, priority:100
msgid "The <feature> part of the command may be any one of the following:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
#, no-wrap, priority:100
msgid "date-format"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
#, no-wrap, priority:100
msgid "export-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
#, no-wrap, priority:100
msgid "relative-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
#, no-wrap, priority:100
msgid "no-relative-marks"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
#, no-wrap, priority:100
msgid "force"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
#, priority:100
msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
#, no-wrap, priority:100
msgid "import-marks"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
#, no-wrap, priority:100
msgid "import-marks-if-exists"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
#, priority:100
msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
#, no-wrap, priority:100
msgid "get-mark"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
#, no-wrap, priority:100
msgid "cat-blob"
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
#, no-wrap, priority:100
msgid "ls"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
#, no-wrap, priority:100
msgid "notes"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
#, priority:100
msgid "Require that the backend support the 'notemodify' (N) subcommand to the 'commit' command. Versions of fast-import not supporting notes will exit with a message indicating so."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
#, no-wrap, priority:100
msgid "done"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
#, priority:100
msgid "Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected. This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
#, no-wrap, priority:100
msgid " 'option' SP <option> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
#, priority:100
msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
#, priority:100
msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
#, priority:100
msgid "The following command-line options change import semantics and may therefore not be passed as option:"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
#, priority:100
msgid "cat-blob-fd"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
#, priority:100
msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
#, no-wrap, priority:100
msgid "RESPONSES TO COMMANDS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
#, priority:100
msgid "New objects written by fast-import are not available immediately. Most fast-import commands have no visible effect until the next checkpoint (or completion). The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
#, priority:100
msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects). This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
#, no-wrap, priority:100
msgid ""
"\tmkfifo fast-import-output\n"
@@ -22209,49 +22383,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
#, priority:100
msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
#, priority:100
msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
#, no-wrap, priority:100
msgid "CRASH REPORTS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
#, priority:100
msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report. This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
#, priority:100
msgid "An example crash:"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
#, no-wrap, priority:100
msgid ""
"\t$ cat >in <<END_OF_INPUT\n"
@@ -22271,7 +22445,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
#, no-wrap, priority:100
msgid ""
"\t$ git fast-import <in\n"
@@ -22280,7 +22454,7 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
#, no-wrap, priority:100
msgid ""
"\t$ cat .git/fast_import_crash_8434\n"
@@ -22291,13 +22465,13 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
#, no-wrap, priority:100
msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
#, no-wrap, priority:100
msgid ""
"\tMost Recent Commands Before Crash\n"
@@ -22312,50 +22486,39 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
#, no-wrap, priority:100
msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1314
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
#, priority:100
msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
#, priority:100
msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1328
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -22365,307 +22528,307 @@ msgid ""
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
#, priority:100
msgid "------------------- END OF CRASH REPORT"
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
#, no-wrap, priority:100
msgid "TIPS AND TRICKS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
#, priority:100
msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
#, no-wrap, priority:100
msgid "Use One Mark Per Commit"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
#, priority:100
msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
#, no-wrap, priority:100
msgid "Freely Skip Around Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
#, priority:100
msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import. Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
#, priority:100
msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
#, no-wrap, priority:100
msgid "Handling Renames"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
#, priority:100
msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit. Git performs rename detection after-the-fact, rather than explicitly during a commit."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
#, no-wrap, priority:100
msgid "Use Tag Fixup Branches"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
#, priority:100
msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset. Or to create tags which are a subset of the files available in the repository."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
#, priority:100
msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch. Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
#, priority:100
msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
#, no-wrap, priority:100
msgid "Import Now, Repack Later"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
#, priority:100
msgid "As soon as fast-import completes the Git repository is completely valid and ready for use. Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
#, priority:100
msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed. fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
#, no-wrap, priority:100
msgid "Repacking Historical Data"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
#, priority:100
msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
#, no-wrap, priority:100
msgid "Include Some Progress Messages"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
#, priority:100
msgid "Every once in a while have your frontend emit a `progress` message to fast-import. The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month. Your users will feel better knowing how much of the data stream has been processed."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
#, no-wrap, priority:100
msgid "PACKFILE OPTIMIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
#, priority:100
msgid "When packing a blob fast-import always attempts to deltify against the last blob written. Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible. The resulting packfile will be compressed, but will not be optimal."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
#, priority:100
msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access. If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
#, priority:100
msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
#, no-wrap, priority:100
msgid "MEMORY UTILIZATION"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
#, priority:100
msgid "There are a number of factors which affect how much memory fast-import requires to perform an import. Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc. In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
#, no-wrap, priority:100
msgid "per object"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
#, priority:100
msgid "fast-import maintains an in-memory structure for every object written in this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes). Objects in the table are not deallocated until fast-import terminates. Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
#, no-wrap, priority:100
msgid "per mark"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
#, no-wrap, priority:100
msgid "per branch"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
#, priority:100
msgid "Branches are classified as active and inactive. The memory usage of the two classes is significantly different."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
#, priority:100
msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch. If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
#, priority:100
msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
#, no-wrap, priority:100
msgid "per active tree"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
#, priority:100
msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below). The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
msgstr ""
#. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
#, no-wrap, priority:100
msgid "per active file entry"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
msgstr ""
#. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
#, no-wrap, priority:100
msgid "SIGNALS"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
#, priority:100
msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
msgstr ""
@@ -22906,26 +23069,32 @@ msgstr ""
msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
+#. type: Plain text
+#: en/git-fetch.txt:54
+#, priority:220
+msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported."
+msgstr ""
+
#. type: Title -
-#: en/git-fetch.txt:55
+#: en/git-fetch.txt:59
#, no-wrap, priority:220
msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:61
+#: en/git-fetch.txt:65
#, priority:220
msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:63
+#: en/git-fetch.txt:67
#, priority:220
msgid "Typically such a variable may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:67
+#: en/git-fetch.txt:71
#, no-wrap, priority:220
msgid ""
"[remote \"origin\"]\n"
@@ -22933,55 +23102,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:70
+#: en/git-fetch.txt:74
#, priority:220
msgid "This configuration is used in two ways:"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:80
+#: en/git-fetch.txt:84
#, priority:220
msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:97
+#: en/git-fetch.txt:101
#, priority:220
msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:101
+#: en/git-fetch.txt:105
#, priority:220
msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
msgstr ""
#. type: Title -
-#: en/git-fetch.txt:103
+#: en/git-fetch.txt:107
#, no-wrap, priority:220
msgid "PRUNING"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:108
+#: en/git-fetch.txt:112
#, priority:220
msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:114
+#: en/git-fetch.txt:118
#, priority:220
msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:117
+#: en/git-fetch.txt:121
#, priority:220
msgid "These remote-tracking references can be deleted as a one-off with either of:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:121
+#: en/git-fetch.txt:125
#, no-wrap, priority:220
msgid ""
"# While fetching\n"
@@ -22989,7 +23158,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:124
+#: en/git-fetch.txt:128
#, no-wrap, priority:220
msgid ""
"# Only prune, don't fetch\n"
@@ -22997,49 +23166,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:130
+#: en/git-fetch.txt:134
#, priority:220
msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:135
+#: en/git-fetch.txt:139
#, priority:220
msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <-> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:141
+#: en/git-fetch.txt:145
#, priority:220
msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:146
+#: en/git-fetch.txt:150
#, priority:220
msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:150
+#: en/git-fetch.txt:154
#, priority:220
msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:157
+#: en/git-fetch.txt:161
#, priority:220
msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:161
+#: en/git-fetch.txt:165
#, priority:220
msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:166
+#: en/git-fetch.txt:170
#, no-wrap, priority:220
msgid ""
"# These both fetch tags\n"
@@ -23048,25 +23217,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:172
+#: en/git-fetch.txt:176
#, priority:220
msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:177
+#: en/git-fetch.txt:181
#, priority:220
msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:181
+#: en/git-fetch.txt:185
#, priority:220
msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:187
+#: en/git-fetch.txt:191
#, no-wrap, priority:220
msgid ""
"$ git fetch origin --prune --prune-tags\n"
@@ -23076,229 +23245,229 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:195
+#: en/git-fetch.txt:199
#, priority:220
msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:198
+#: en/git-fetch.txt:202
#, priority:220
msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:201
+#: en/git-fetch.txt:205
#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> [<reason>]\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:205
+#: en/git-fetch.txt:209
#, priority:220
msgid "The status of up-to-date refs is shown only if the --verbose option is used."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:210
+#: en/git-fetch.txt:214
#, priority:220
msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:211 en/git-push.txt:431
+#: en/git-fetch.txt:215 en/git-push.txt:431
#, no-wrap, priority:220
msgid "flag"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:213 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, priority:220
msgid "A single character indicating the status of the ref:"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:213 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, no-wrap, priority:220
msgid "(space)"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:214
+#: en/git-fetch.txt:218
#, priority:220
msgid "for a successfully fetched fast-forward;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:214 en/git-push.txt:434
+#: en/git-fetch.txt:218 en/git-push.txt:434
#, no-wrap, priority:220
msgid "`+`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:215 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, priority:220
msgid "for a successful forced update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:215 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr "`-`"
#. type: Plain text
-#: en/git-fetch.txt:216
+#: en/git-fetch.txt:220
#, priority:220
msgid "for a successfully pruned ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:216
+#: en/git-fetch.txt:220
#, ignore-same, no-wrap, priority:220
msgid "`t`"
msgstr "`t`"
#. type: Plain text
-#: en/git-fetch.txt:217
+#: en/git-fetch.txt:221
#, priority:220
msgid "for a successful tag update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:217 en/git-push.txt:436
+#: en/git-fetch.txt:221 en/git-push.txt:436
#, no-wrap, priority:220
msgid "`*`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:218
+#: en/git-fetch.txt:222
#, priority:220
msgid "for a successfully fetched new ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:218 en/git-push.txt:437
+#: en/git-fetch.txt:222 en/git-push.txt:437
#, no-wrap, priority:220
msgid "`!`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:219
+#: en/git-fetch.txt:223
#, priority:220
msgid "for a ref that was rejected or failed to update; and"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:219 en/git-push.txt:438
+#: en/git-fetch.txt:223 en/git-push.txt:438
#, no-wrap, priority:220
msgid "`=`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:220
+#: en/git-fetch.txt:224
#, priority:220
msgid "for a ref that was up to date and did not need fetching."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:221 en/git-push.txt:440
+#: en/git-fetch.txt:225 en/git-push.txt:440
#, no-wrap, priority:220
msgid "summary"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:226
+#: en/git-fetch.txt:230
#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:227 en/git-push.txt:468
+#: en/git-fetch.txt:231 en/git-push.txt:468
#, no-wrap, priority:220
msgid "from"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:231
+#: en/git-fetch.txt:235
#, priority:220
msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1251
+#: en/git-fetch.txt:236 en/git-push.txt:473 en/git-rebase.txt:1273
#, no-wrap, priority:220
msgid "to"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:235
+#: en/git-fetch.txt:239
#, priority:220
msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:236 en/git-push.txt:477
+#: en/git-fetch.txt:240 en/git-push.txt:477
#, no-wrap, priority:220
msgid "reason"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:240
+#: en/git-fetch.txt:244
#, priority:220
msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:245
+#: en/git-fetch.txt:249
#, priority:220
msgid "Update the remote-tracking branches:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:248
+#: en/git-fetch.txt:252
#, no-wrap, priority:220
msgid "$ git fetch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:254
+#: en/git-fetch.txt:258
#, priority:220
msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:256
+#: en/git-fetch.txt:260
#, priority:220
msgid "Using refspecs explicitly:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:259
+#: en/git-fetch.txt:263
#, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:264
+#: en/git-fetch.txt:268
#, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:267
+#: en/git-fetch.txt:271
#, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:270
+#: en/git-fetch.txt:274
#, priority:220
msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:274
+#: en/git-fetch.txt:278
#, no-wrap, priority:220
msgid ""
"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
@@ -23306,13 +23475,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:281
+#: en/git-fetch.txt:285
#, priority:220
msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:292 en/git-pull.txt:248
+#: en/git-fetch.txt:296 en/git-pull.txt:248
#, priority:220
msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
@@ -24329,7 +24498,7 @@ msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
"\t\t [--points-at=<object>]\n"
-"\t\t (--merged[=<object>] | --no-merged[=<object>])\n"
+"\t\t [--merged[=<object>]] [--no-merged[=<object>]]\n"
"\t\t [--contains[=<object>]] [--no-contains[=<object>]]\n"
msgstr ""
@@ -24436,235 +24605,235 @@ msgid "--merged[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:81
+#: en/git-for-each-ref.txt:80
#, priority:100
-msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified), incompatible with `--no-merged`."
+msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:82
+#: en/git-for-each-ref.txt:81
#, no-wrap, priority:100
msgid "--no-merged[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:86
+#: en/git-for-each-ref.txt:84
#, priority:100
-msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified), incompatible with `--merged`."
+msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:87
+#: en/git-for-each-ref.txt:85
#, no-wrap, priority:100
msgid "--contains[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:90
+#: en/git-for-each-ref.txt:88
#, priority:100
msgid "Only list refs which contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:91
+#: en/git-for-each-ref.txt:89
#, no-wrap, priority:100
msgid "--no-contains[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:94
+#: en/git-for-each-ref.txt:92
#, priority:100
msgid "Only list refs which don't contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:97
+#: en/git-for-each-ref.txt:95
#, priority:100
msgid "Sorting and filtering refs are case insensitive."
msgstr ""
#. type: Title -
-#: en/git-for-each-ref.txt:99
+#: en/git-for-each-ref.txt:97
#, no-wrap, priority:100
msgid "FIELD NAMES"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:104
+#: en/git-for-each-ref.txt:102
#, priority:100
msgid "Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:106
+#: en/git-for-each-ref.txt:104
#, priority:100
msgid "For all objects, the following names can be used:"
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:107
+#: en/git-for-each-ref.txt:105
#, no-wrap, priority:100
msgid "refname"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:123
+#: en/git-for-each-ref.txt:121
#, priority:100
msgid "The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is appended, strips `<N>` slash-separated path components from the front (back) of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a negative number, strip as many path components as necessary from the specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/tags/foo` into `refs`). When the ref does not have enough components, the result becomes an empty string if stripping with positive <N>, or it becomes the full refname if stripping with negative <N>. Neither is an error."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:125
+#: en/git-for-each-ref.txt:123
#, priority:100
msgid "`strip` can be used as a synonym to `lstrip`."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:126
+#: en/git-for-each-ref.txt:124
#, no-wrap, priority:100
msgid "objecttype"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:128
+#: en/git-for-each-ref.txt:126
#, priority:100
msgid "The type of the object (`blob`, `tree`, `commit`, `tag`)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:129
+#: en/git-for-each-ref.txt:127
#, no-wrap, priority:100
msgid "objectsize"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:133
+#: en/git-for-each-ref.txt:131
#, priority:100
msgid "The size of the object (the same as 'git cat-file -s' reports). Append `:disk` to get the size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:133
+#: en/git-for-each-ref.txt:131
#, no-wrap, priority:100
msgid "objectname"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:139
+#: en/git-for-each-ref.txt:137
#, priority:100
msgid "The object name (aka SHA-1). For a non-ambiguous abbreviation of the object name append `:short`. For an abbreviation of the object name with desired length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:139
+#: en/git-for-each-ref.txt:137
#, no-wrap, priority:100
msgid "deltabase"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:143
+#: en/git-for-each-ref.txt:141
#, priority:100
msgid "This expands to the object name of the delta base for the given object, if it is stored as a delta. Otherwise it expands to the null object name (all zeroes)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:144
+#: en/git-for-each-ref.txt:142
#, no-wrap, priority:100
msgid "upstream"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:154
+#: en/git-for-each-ref.txt:152
#, priority:100
msgid "The name of a local ref which can be considered ``upstream'' from the displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as `refname` above. Additionally respects `:track` to show \"[ahead N, behind M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:track,nobracket` to show tracking information without brackets (i.e \"ahead N, behind M\")."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:161
+#: en/git-for-each-ref.txt:159
#, priority:100
msgid "For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and `%(upstream:remoteref)` refer to the name of the remote and the name of the tracked remote ref, respectively. In other words, the remote-tracking branch can be updated explicitly and individually by using the refspec `%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:165
+#: en/git-for-each-ref.txt:163
#, priority:100
msgid "Has no effect if the ref does not have tracking information associated with it. All the options apart from `nobracket` are mutually exclusive, but if used together the last option is selected."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:166
+#: en/git-for-each-ref.txt:164
#, no-wrap, priority:100
msgid "push"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:172
+#: en/git-for-each-ref.txt:170
#, priority:100
msgid "The name of a local ref which represents the `@{push}` location for the displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. Produces an empty string if no `@{push}` ref is configured."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:376
+#: en/git-for-each-ref.txt:171 en/git.txt:383
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:176
+#: en/git-for-each-ref.txt:174
#, priority:100
msgid "'*' if HEAD matches current ref (the checked out branch), ' ' otherwise."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:182
+#: en/git-for-each-ref.txt:180
#, priority:100
msgid "Change output color. Followed by `:<colorname>`, where color names are described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. For example, `%(color:bold red)`."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:183
+#: en/git-for-each-ref.txt:181
#, no-wrap, priority:100
msgid "align"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:197
+#: en/git-for-each-ref.txt:195
#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:198
+#: en/git-for-each-ref.txt:196
#, no-wrap, priority:100
msgid "if"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:210
+#: en/git-for-each-ref.txt:208
#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:211
+#: en/git-for-each-ref.txt:209
#, no-wrap, priority:100
msgid "symref"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:216
+#: en/git-for-each-ref.txt:214
#, priority:100
msgid "The ref which the given symbolic ref refers to. If not a symbolic ref, nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options in the same way as `refname` above."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:217
+#: en/git-for-each-ref.txt:215
#, no-wrap, priority:100
msgid "worktreepath"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:221
+#: en/git-for-each-ref.txt:219
#, priority:100
msgid "The absolute path to the worktree in which the ref is checked out, if it is checked out in any linked worktree. Empty string otherwise."
msgstr ""
@@ -24672,7 +24841,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:225
#, priority:100
-msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
+msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. Fields `tree` and `parent` can also be used with modifier `:short` and `:short=<length>` just like `objectname`."
msgstr ""
#. type: Plain text
@@ -24682,67 +24851,134 @@ msgid "For commit and tag objects, the special `creatordate` and `creator` field
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:234
+#: en/git-for-each-ref.txt:237
#, priority:100
-msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
+msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component. For email fields (`authoremail`, `committeremail` and `taggeremail`), `:trim` can be appended to get the email without angle brackets, and `:localpart` to get the part before the `@` symbol out of the trimmed email."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:247
+#: en/git-for-each-ref.txt:240
#, priority:100
-msgid "The complete message in a commit and tag object is `contents`. Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line. The next line is `contents:body`, where body is all of the lines after the first blank line. The optional GPG signature is `contents:signature`. The first `N` lines of the message is obtained using `contents:lines=N`. Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
+msgid "The message in a commit or a tag object is `contents`, from which `contents:<part>` can be used to extract various parts out of:"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:241
+#, no-wrap, priority:100
+msgid "contents:size"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:243
+#, priority:100
+msgid "The size in bytes of the commit or tag message."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:244
+#, no-wrap, priority:100
+msgid "contents:subject"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:251
#, priority:100
+msgid "The first paragraph of the message, which typically is a single line, is taken as the \"subject\" of the commit or the tag message. Instead of `contents:subject`, field `subject` can also be used to obtain same results. `:sanitize` can be appended to `subject` for subject line suitable for filename."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:252
+#, no-wrap, priority:100
+msgid "contents:body"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:255
+#, priority:100
+msgid "The remainder of the commit or the tag message that follows the \"subject\"."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:256
+#, no-wrap, priority:100
+msgid "contents:signature"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:258
+#, priority:100
+msgid "The optional GPG signature of the tag."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:259
+#, fuzzy, no-wrap, priority:100
+#| msgid "--comment-lines"
+msgid "contents:lines=N"
+msgstr "--comment-lines"
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:261
+#, priority:100
+msgid "The first `N` lines of the message."
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:268
+#, priority:100
+msgid "Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:272
+#, priority:100
msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:254
+#: en/git-for-each-ref.txt:275
#, priority:100
msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:258
+#: en/git-for-each-ref.txt:279
#, priority:100
msgid "In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:262
+#: en/git-for-each-ref.txt:283
#, priority:100
msgid "As a special case for the date-type fields, you may specify a format for the date by adding `:` followed by date format name (see the values the `--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:265
+#: en/git-for-each-ref.txt:286
#, priority:100
msgid "Some atoms like %(align) and %(if) always require a matching %(end). We call them \"opening atoms\" and sometimes denote them as %($open)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:270
+#: en/git-for-each-ref.txt:291
#, priority:100
msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:277
+#: en/git-for-each-ref.txt:298
#, priority:100
msgid "An example directly producing formatted text. Show the most recent 3 tagged commits:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:280 en/git-for-each-ref.txt:296 en/git-for-each-ref.txt:310 en/git-bisect-lk2009.txt:933
+#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317 en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
#, no-wrap, priority:100
msgid "#!/bin/sh\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:286
+#: en/git-for-each-ref.txt:307
#, no-wrap, priority:100
msgid ""
"git for-each-ref --count=3 --sort='-*authordate' \\\n"
@@ -24753,7 +24989,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:289
+#: en/git-for-each-ref.txt:310
#, no-wrap, priority:100
msgid ""
"%(*body)\n"
@@ -24761,13 +24997,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:294
+#: en/git-for-each-ref.txt:315
#, priority:100
msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:303
+#: en/git-for-each-ref.txt:324
#, no-wrap, priority:100
msgid ""
"git for-each-ref --shell --format=\"ref=%(refname)\" refs/heads | \\\n"
@@ -24779,13 +25015,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:308
+#: en/git-for-each-ref.txt:329
#, priority:100
msgid "A bit more elaborate report on tags, demonstrating that the format may be an entire script:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:315
+#: en/git-for-each-ref.txt:336
#, no-wrap, priority:100
msgid ""
"fmt='\n"
@@ -24795,7 +25031,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:322
+#: en/git-for-each-ref.txt:343
#, no-wrap, priority:100
msgid ""
"\to=%(*objectname)\n"
@@ -24807,7 +25043,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:341
+#: en/git-for-each-ref.txt:362
#, no-wrap, priority:100
msgid ""
"\tkind=Tag\n"
@@ -24831,13 +25067,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:343
+#: en/git-for-each-ref.txt:364
#, no-wrap, priority:100
msgid " $s\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:350
+#: en/git-for-each-ref.txt:371
#, no-wrap, priority:100
msgid ""
"Its message reads as:\n"
@@ -24849,7 +25085,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:356
+#: en/git-for-each-ref.txt:377
#, no-wrap, priority:100
msgid ""
"eval=`git for-each-ref --shell --format=\"$fmt\" \\\n"
@@ -24860,25 +25096,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:361
+#: en/git-for-each-ref.txt:382
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:364
+#: en/git-for-each-ref.txt:385
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:369
+#: en/git-for-each-ref.txt:390
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:372
+#: en/git-for-each-ref.txt:393
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
msgstr ""
@@ -25614,7 +25850,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -26384,7 +26620,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:408
+#: en/git-fsck.txt:162 en/git.txt:415
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -27100,7 +27336,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1110
+#: en/git-grep.txt:220 en/rev-list-options.txt:1109
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -27292,7 +27528,7 @@ msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:133
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
@@ -27454,7 +27690,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:60
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -27508,7 +27744,7 @@ msgid "Display the currently running version of 'git gui'."
msgstr ""
#. type: Title -
-#: en/git-gui.txt:52 en/git-imap-send.txt:63 en/git-whatchanged.txt:29
+#: en/git-gui.txt:52 en/git-whatchanged.txt:29
#, no-wrap, priority:100
msgid "Examples"
msgstr ""
@@ -27747,7 +27983,7 @@ msgstr ""
#: en/git-help.txt:13
#, no-wrap, priority:100
msgid ""
-"'git help' [-a|--all [--[no-]verbose]] [-g|--guide]\n"
+"'git help' [-a|--all [--[no-]verbose]] [-g|--guides]\n"
"\t [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]\n"
msgstr ""
@@ -27766,7 +28002,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:26
#, priority:100
-msgid "If the option `--guide` or `-g` is given, a list of the useful Git guides is also printed on the standard output."
+msgid "If the option `--guides` or `-g` is given, a list of the Git concept guides is also printed on the standard output."
msgstr ""
#. type: Plain text
@@ -27832,7 +28068,7 @@ msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:63
#, priority:100
-msgid "Prints a list of useful guides on the standard output. This option overrides any given command or guide name."
+msgid "Prints a list of the Git concept guides on the standard output. This option overrides any given command or guide name."
msgstr ""
#. type: Labeled list
@@ -28533,7 +28769,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:13
#, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
msgstr ""
#. type: Plain text
@@ -28604,12 +28840,24 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files. The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
#, ignore-same, no-wrap, priority:100
msgid "--recover"
msgstr "--recover"
#. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
#, priority:100
msgid "Verify that everything reachable from target is fetched. Used after an earlier fetch is interrupted."
msgstr ""
@@ -28836,17 +29084,17 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
#, priority:100
-msgid "To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values."
+msgid "To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:66
+#: en/git-imap-send.txt:62
#, priority:100
msgid "Using tunnel mode:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:71
+#: en/git-imap-send.txt:67
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28855,13 +29103,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:74
+#: en/git-imap-send.txt:70
#, priority:100
msgid "Using direct mode:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:81
+#: en/git-imap-send.txt:77
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28872,13 +29120,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:84
+#: en/git-imap-send.txt:80
#, priority:100
msgid "Using direct mode with SSL:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:93
+#: en/git-imap-send.txt:89
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28887,17 +29135,23 @@ msgid ""
" user = bob\n"
" pass = p4ssw0rd\n"
" port = 123\n"
-" sslverify = false\n"
+" ; sslVerify = false\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-imap-send.txt:98
+#, priority:100
+msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:100
#, priority:100
-msgid "To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig to specify your account settings:"
+msgid "Using Gmail's IMAP interface:"
msgstr ""
#. type: delimited block -
-#: en/git-imap-send.txt:108
+#: en/git-imap-send.txt:107
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28905,47 +29159,52 @@ msgid ""
"\thost = imaps://imap.gmail.com\n"
"\tuser = user@gmail.com\n"
"\tport = 993\n"
-"\tsslverify = false\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:112
#, priority:100
-msgid "You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get an error that the \"Folder doesn't exist\"."
+msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
+msgstr ""
+
+#. type: Plain text
+#: en/git-imap-send.txt:116
+#, priority:100
+msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:114
+#: en/git-imap-send.txt:118
#, priority:100
msgid "Once the commits are ready to be sent, run the following command:"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:116
+#: en/git-imap-send.txt:120
#, no-wrap, priority:100
msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:120
+#: en/git-imap-send.txt:124
#, priority:100
-msgid "Just make sure to disable line wrapping in the email client (GMail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
+msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
msgstr ""
#. type: Title -
-#: en/git-imap-send.txt:122
+#: en/git-imap-send.txt:126
#, no-wrap, priority:100
msgid "CAUTION"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:129
+#: en/git-imap-send.txt:133
#, priority:100
msgid "It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project. Many projects do not like patches to be attached. Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail. You will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:133
+#: en/git-imap-send.txt:137
#, no-wrap, priority:100
msgid ""
"Thunderbird in particular is known to be problematic. Thunderbird\n"
@@ -28954,7 +29213,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:137
+#: en/git-imap-send.txt:141
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)"
msgstr ""
@@ -29100,20 +29359,40 @@ msgstr ""
msgid "Die, if the pack is larger than <size>."
msgstr ""
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--object-format=<format>"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--object-format=<snið>"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack. The valid values are 'sha1' and (if enabled) 'sha256'. The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "Gefa upp snið viðkomandi viðfangs (reikniforskrift mylnuskrár) fyrir hirsluna. Gild gildi eru 'sha1' og (ef virkt) 'sha256'. Forstillingin er 'sha1'."
+
#. type: Plain text
#: en/git-index-pack.txt:103
#, priority:100
-msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:113
+#, priority:100
+msgid "Once the index has been created, the hash that goes into the name of the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
msgstr ""
#. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:113
#, no-wrap, priority:100
msgid "keep file used as a lock to prevent the race with 'git repack'"
msgstr ""
#. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:115
#, priority:100
msgid "mentioned above."
msgstr ""
@@ -29155,11 +29434,16 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
msgstr "git-init - Búa til tóma Git hirslu eða endurfrumstilla hirslu sem er til"
#. type: Plain text
-#: en/git-init.txt:15
-#, no-wrap, priority:300
+#: en/git-init.txt:16
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\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=<sniðmótaskrá>]\n"
@@ -29167,217 +29451,237 @@ msgstr ""
"\t [--shared[=<leyfi>]] [directory]\n"
#. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
#, priority:300
msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr "Þessi skipun býr til tóma Git hirslu - í raun `.git` skrá með undirskrám fyrir `objects` (viðföng), `refs/heads` (tilvísanir/hausar), `refs/tags` (tilvísanir/merki), og sniðmátsskjöl."
#. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
#, priority:300
msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
msgstr "Ef `$GIT_DIR` umhverfisbreytan er uppgefin þá tilgreinir hún slóð til þess að nota í staðinn fyrir `./.git` fyrir grunnbyggingu hirslunnar."
#. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
#, priority:300
msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr "Ef viðfangageymslan er tilgreind með `$GIT_OBJECT_DIRECTORY`(viðföng skrá) umhverfisbreytunni þá eru SHA-1 öryggisskrárnar búnar til þar undir - annars er frumstillt skrá samkvæmt `$GIT_DIR/objects` (skrá viðföng) notuð."
#. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
#, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr "Að framkvæma 'git init' í hirslu sem þegar er til er öruggt. Það mun ekki skrifa yfir það sem þegar er í hirslunni. Helsta ástæðan fyrir því að endurframkvæma 'git init' er til þess að taka með sniðmát sem nýlega hefur verið bætt við (eða til þess að færa hirsluna á nýjan stað ef --separate-git-dir (aðskilinn git skrá) er gefið upp)."
#. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
#, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
msgstr "Prenta einungis villu- og varnaðarboð; allt annað frálag er þaggað."
#. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
#, priority:300
msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
msgstr "Búa til nakta hirslu. Ef `GIT_DIR`(git skrá) umhverfisbreytan er ekki tilgreind er hirslan búin til í núgildandi vinnuskrá."
#. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
#, no-wrap, priority:300
msgid "--object-format=<format>"
msgstr "--object-format=<snið>"
#. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
#, priority:300
msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
msgstr "Gefa upp snið viðkomandi viðfangs (reikniforskrift mylnuskrár) fyrir hirsluna. Gild gildi eru 'sha1' og (ef virkt) 'sha256'. Forstillingin er 'sha1'."
#. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:63
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr "Tilgreina skrána sem geymir þau sniðmót sem verða notuð. (Sjá \"SNIÐMÁTASKRÁ\" hlutann hér að neðan.)"
#. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:70
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr "Í stað þess að frumstilla hrisluna sem skrá sem annað hvort `$GIT_DIR` eða `./.git/`, búa til textaskrá þar sem inniheldur slóðina til hinnar raunverulegu hirslu. Þessi skrá virkar eins og táknrænn Git hlekkur til skrárinnar sem er ómeðvitaður um skráasafnið."
#. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:72
#, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr "Ef þetta er endurfrumstilling verður hirslan færð eftir tilgreindri slóð."
#. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:73
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch <name>"
+msgid "-b <branch-name>"
+msgstr "--branch <nafn>"
+
+#. type: Labeled list
+#: en/git-init.txt:74
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch <name>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--branch <nafn>"
+
+#. type: Plain text
+#: en/git-init.txt:78
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository. If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:79
#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:87
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr "Tilgreina að Git hirslunni muni verða deilt meðal fjölmargra notenda. Þetta leyfir notendum sem tilheyra sama hópi að ýta gögnum inn í þá hirslu. Þegar þessi tilgreining er til staðar er stillingabreytan \"core.sharedRepository\" (kjarni deild hirsla) stillt þannig að skjöl og skrár undir `$GIT_DIR` (git skrá) eru búnar til með umbeðnum leyfum. Þegar þessi tilgreining er ekki til staðar notar Git leyfi sem koma frá umask(2) (leyfasetningar skjala)."
#. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:90
#, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr "Valmöguleikinn getur haft eftirfarandi gildi, frumstilltur á 'group' (hópur) ef engin gildi eru gefin:"
#. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'umask' (or 'false')"
msgstr "'umask' (eða 'false')"
#. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:96
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr "Nota leyfi frá umask(2) (leyfasetningar skjala). Þetta er frumstillingin þegar `--shared` (deildur) er ekki uppgefinn."
#. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:97
#, no-wrap, priority:300
msgid "'group' (or 'true')"
msgstr "'group' (eða 'true')"
#. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:105
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr "Gera hirsluna hópskrifanlega (og g+sx þar sem git hópurinn er mögulega ekki aðalhópur allra notenda). Þetta er notað til þess að losa um leyfisgildi umask(2) (leyfasetningar skjala) gildis sem annars vegar er öruggt. Athugaðu að umask gildið er enn virkt fyrir leyfi sem ná yfir önnur gögn (t.d. ef umask er '0022', mun það að nota 'group' (hópur) ekki fjarlægja lesréttindi annarra notenda sem eru ekki í hópnum). Sjá '0xxx' fyrir hvernig á nákvæmlega að stilla leyfi hirslunnar."
#. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:106
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
msgstr "'all' (eða 'world' eða 'everybody')"
#. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:109
#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
msgstr "Sama og 'group', en gerir hirsluna lesanlega fyrir alla notendur."
#. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:110
#, no-wrap, priority:300
msgid "'0xxx'"
msgstr "'0xxx'"
#. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:117
#, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr "'0xxx' er áttundartala og hvert skjal fylgir fyrirkomulaginu '0xxx'. '0xxx' tekur ekki tilliti til gildis umask(2) (leyfasetningar skjala) sem tilgreint er af notanda (og ekki einungis víkka leyfi eins og 'group' (hópur) og 'all' (allir) gera). '0640' býr til hirslu sem er lesanleg af hóp, en ekki skrifanleg af hóp eða opin öðrum. '0660' mun búa til hirslu sem er lesanleg og skrifanleg fyrir núverandi notanada og hóp, en lokuð öllum öðrum."
#. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:122
#, priority:300
msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
msgstr "Í deildum hirslum er stillingarvalmöguleikinn `receive.denyNonFastForwards`(viðtaka neita ekki framspóla) forstilltur sem gildur svo að þú getur ekki ýtt gögnum sem ekki framspóla inn í hana með þvingunum."
#. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:125
#, priority:300
msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
msgstr "Ef þú gefur upp 'skrá', verður skipunin framkvæmd í henni. Ef skráin er ekki til verður hún búin til."
#. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:127
#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
msgstr "SNIÐMÓTASKRÁ"
#. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:131
#, priority:300
msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr "Skjöl og skrár í sniðmótaskránni sem hafa ekki nafn sem byrjar á punkti verða afrituð yfir í `$GIT_DIR`(git skrá) eftir að hún er búin til."
#. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:133
#, priority:300
msgid "The template directory will be one of the following (in order):"
msgstr "Sniðmótaskráin verður eitt af eftirtöldu (í röð):"
#. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:135
#, priority:300
msgid "the argument given with the `--template` option;"
msgstr "breytan sem gefin er með `--template` (sniðmót) valmöguleikanum;"
#. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:137
#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
msgstr "innihald `$GIT_TEMPLATE_DIR`(git sniðmót skrá) umhverfisbreytunnar;"
#. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:139
#, priority:300
msgid "the `init.templateDir` configuration variable; or"
msgstr "stillingabreytan `init.templateDir` (frumstilla sniðmót skrá); eða"
#. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:141
#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
msgstr "forstillta sniðmótaskráin: `/usr/share/git-core/templates` (notandi deila git-kjarni sniðmót)."
#. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:144
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr "Forstillta sniðmótaskráin hefur einhverjar undirskrár, tillögur um \"exclude patterns\" (hunsunarmynstur) (see linkgit:gitignore[5] (hlekk-git git-hunsa), og dæmi um krækjuskjöl."
#. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:147
#, priority:300
msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr "Krækjudæmin eru öll forstillt sem óvirk. TIl þess að virkja eitt af krækjudæmunum þarf að endurnefna það með því að fjarlægja `.sample` (dæmi) viðskeytið."
#. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:149
#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
msgstr "Sjá linkgit:githooks[5] (hlekk-git git-krækjur) fyrir frekari upplýsingar um það hvernig á að hrinda krækjum í framkvæmd."
#. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:153
#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
msgstr "Stofna nýja Git hirslu fyrir forskriftargrunn sem þegar er til"
#. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:160
#, no-wrap, priority:300
msgid ""
"$ cd /path/to/my/codebase\n"
@@ -29391,19 +29695,19 @@ msgstr ""
"$ git commit <3>\n"
#. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:163
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
msgstr "Býr til skrána /slóð/til/míns/forskriftargrunns/.git."
#. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:164
#, priority:300
msgid "Add all existing files to the index."
msgstr "Bæta öllum skrám sem eru til í atriðaskrána."
#. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:165
#, priority:300
msgid "Record the pristine state as the first commit in the history."
msgstr "Bóka ósnerta stöðu sem fyrsta innlegg í sögunni."
@@ -30262,409 +30566,458 @@ msgid "Shows the commit logs."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:22
+#: en/git-log.txt:25
#, priority:260
-msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
+msgid "The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to the linkgit:git-diff[1] command to control how the changes each commit introduces are shown."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:27
+#: en/git-log.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--follow"
msgstr "--follow"
#. type: Plain text
-#: en/git-log.txt:30
+#: en/git-log.txt:33
#, priority:260
msgid "Continue listing the history of a file beyond renames (works only for a single file)."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:31
+#: en/git-log.txt:34
#, ignore-same, no-wrap, priority:260
msgid "--no-decorate"
msgstr "--no-decorate"
#. type: Labeled list
-#: en/git-log.txt:32
+#: en/git-log.txt:35
#, no-wrap, priority:260
msgid "--decorate[=short|full|auto|no]"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:40
+#: 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'."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:41
+#: en/git-log.txt:44
#, no-wrap, priority:260
msgid "--decorate-refs=<pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:42
+#: en/git-log.txt:45
#, no-wrap, priority:260
msgid "--decorate-refs-exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:50
+#: en/git-log.txt:53
#, 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:51
+#: en/git-log.txt:54
#, ignore-same, no-wrap, priority:260
msgid "--source"
msgstr "--source"
#. type: Plain text
-#: en/git-log.txt:54
+#: en/git-log.txt:57
#, 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:55
+#: en/git-log.txt:58
#, ignore-same, no-wrap, priority:260
msgid "--[no-]mailmap"
msgstr "--[no-]mailmap"
#. type: Labeled list
-#: en/git-log.txt:56
+#: en/git-log.txt:59
#, ignore-same, no-wrap, priority:260
msgid "--[no-]use-mailmap"
msgstr "--[no-]use-mailmap"
#. type: Plain text
-#: en/git-log.txt:60
+#: en/git-log.txt:63
#, 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:61
+#: en/git-log.txt:64
#, ignore-same, no-wrap, priority:260
msgid "--full-diff"
msgstr "--full-diff"
#. type: Plain text
-#: en/git-log.txt:67
+#: en/git-log.txt:70
#, 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:70
+#: en/git-log.txt:73
#, 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:71
+#: en/git-log.txt:74
#, ignore-same, no-wrap, priority:260
msgid "--log-size"
msgstr "--log-size"
#. type: Plain text
-#: en/git-log.txt:76
+#: en/git-log.txt:79
#, 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:77
+#: en/git-log.txt:80
#, no-wrap, priority:260
msgid "-L <start>,<end>:<file>"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:78
+#: en/git-log.txt:81
#, no-wrap, priority:260
msgid "-L :<funcname>:<file>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:89
+#: en/git-log.txt:92
#, priority:260
msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:92 en/git-shortlog.txt:63
+#: en/git-log.txt:95 en/git-shortlog.txt:92
#, no-wrap, priority:260
msgid "<revision range>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:100
+#: en/git-log.txt:103
#, 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:101 en/git-shortlog.txt:72
+#: en/git-log.txt:104 en/git-shortlog.txt:101
#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:106
+#: en/git-log.txt:109
#, 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:109 en/git-shortlog.txt:78
+#: en/git-log.txt:112 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:115 en/git-show.txt:49
+#: en/git-log.txt:118
#, no-wrap, priority:260
-msgid "COMMON DIFF OPTIONS"
+msgid "DIFF FORMATTING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:122
+#, 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:129
+#, priority:260
+msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never 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 merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:136
+#, priority:260
+msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:142
+#, priority:260
+msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:157
+#, priority:260
+msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:124
+#: en/git-log.txt:158
+#, fuzzy, no-wrap, priority:260
+#| msgid "diffmerge"
+msgid "--diff-merges=off"
+msgstr "diffmerge"
+
+#. type: Labeled list
+#: en/git-log.txt:159
+#, ignore-same, no-wrap, priority:260
+msgid "--no-diff-merges"
+msgstr "--no-diff-merges"
+
+#. type: Plain text
+#: en/git-log.txt:162
+#, priority:260
+msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-log.txt:170
#, no-wrap, priority:260
msgid "`git log --no-merges`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:127
+#: en/git-log.txt:173
#, priority:260
msgid "Show the whole commit history, but skip any merges"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:128
+#: en/git-log.txt:174
#, no-wrap, priority:260
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:132
+#: en/git-log.txt:178
#, 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:133
+#: en/git-log.txt:179
#, no-wrap, priority:260
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:138
+#: en/git-log.txt:184
#, 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:139
+#: en/git-log.txt:185
#, no-wrap, priority:260
msgid "`git log --name-status release..test`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:144
+#: en/git-log.txt:190
#, 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:145
+#: en/git-log.txt:191
#, no-wrap, priority:260
msgid "`git log --follow builtin/rev-list.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:150
+#: en/git-log.txt:196
#, 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:151
+#: en/git-log.txt:197
#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:156
+#: en/git-log.txt:202
#, 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:157
+#: en/git-log.txt:203
#, no-wrap, priority:260
msgid "`git log master --not --remotes=*/master`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:161
+#: en/git-log.txt:207
#, 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:162
+#: en/git-log.txt:208
#, no-wrap, priority:260
msgid "`git log -p -m --first-parent`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:169
+#: en/git-log.txt:215
#, 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:170
+#: en/git-log.txt:216
#, no-wrap, priority:260
msgid "`git log -L '/int main/',/^}/:main.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:174
+#: en/git-log.txt:220
#, priority:260
msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:175
+#: en/git-log.txt:221
#, no-wrap, priority:260
msgid "`git log -3`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:178
+#: en/git-log.txt:224
#, priority:260
msgid "Limits the number of commits to show to 3."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:189
+#: en/git-log.txt:235
#, 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:190
+#: en/git-log.txt:236
#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr "format.pretty"
#. type: Plain text
-#: en/git-log.txt:193
+#: en/git-log.txt:239
#, priority:260
msgid "Default for the `--format` option. (See 'Pretty Formats' above.) Defaults to `medium`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:194
+#: en/git-log.txt:240
#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
#. type: Plain text
-#: en/git-log.txt:198
+#: en/git-log.txt:244
#, 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:199
+#: en/git-log.txt:245
#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr "log.date"
#. type: Plain text
-#: en/git-log.txt:203
+#: en/git-log.txt:249
#, 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:207
+#: en/git-log.txt:253
#, 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:208
+#: en/git-log.txt:254
#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr "log.follow"
#. type: Plain text
-#: en/git-log.txt:213
+#: en/git-log.txt:259
#, 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:214
+#: en/git-log.txt:260
#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
-#: en/git-log.txt:219
+#: en/git-log.txt:265
#, 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:220
+#: en/git-log.txt:266
#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr "log.showSignature"
#. type: Plain text
-#: en/git-log.txt:223
+#: en/git-log.txt:269
#, 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:224
+#: en/git-log.txt:270
#, no-wrap, priority:260
msgid "mailmap.*"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:226
+#: en/git-log.txt:272
#, priority:260
msgid "See linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:227 en/git-notes.txt:333
+#: en/git-log.txt:273 en/git-notes.txt:333
#, no-wrap, priority:260
msgid "notes.displayRef"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:232
+#: en/git-log.txt:278
#, 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:236
+#: en/git-log.txt:282
#, 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:240
+#: en/git-log.txt:286
#, 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 ""
@@ -30993,7 +31346,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:578
+#: en/git-ls-files.txt:132 en/git.txt:587
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -31059,7 +31412,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:374 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -31283,9 +31636,9 @@ msgid ""
"7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
"c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
"0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
"5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
"$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
"$ git ls-remote --tags korg v\\*\n"
"d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -31544,49 +31897,49 @@ msgid "Copy the Message-ID header at the end of the commit message. This is use
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:82
+#: en/git-mailinfo.txt:81
#, priority:100
-msgid "Remove everything in body before a scissors line. A line that mainly consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") marks is called a scissors line, and is used to request the reader to cut the message at that line. If such a line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
+msgid "Remove everything in body before a scissors line (e.g. \"-- >8 --\"). The line represents scissors and perforation marks, and is used to request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:87
+#: en/git-mailinfo.txt:86
#, priority:100
msgid "This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:89
+#: en/git-mailinfo.txt:88
#, priority:100
msgid "This can be enabled by default with the configuration option mailinfo.scissors."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:92
+#: en/git-mailinfo.txt:91
#, priority:100
msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
msgstr ""
#. type: Labeled list
-#: en/git-mailinfo.txt:93
+#: en/git-mailinfo.txt:92
#, no-wrap, priority:100
msgid "<msg>"
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:96
+#: en/git-mailinfo.txt:95
#, priority:100
msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
msgstr ""
#. type: Labeled list
-#: en/git-mailinfo.txt:97
+#: en/git-mailinfo.txt:96
#, no-wrap, priority:100
msgid "<patch>"
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:99
+#: en/git-mailinfo.txt:98
#, priority:100
msgid "The patch extracted from e-mail."
msgstr ""
@@ -31803,7 +32156,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:440
+#: en/git-merge-base.txt:60 en/git-rebase.txt:441
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33440,7 +33793,7 @@ msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:56 en/git-worktree.txt:81
+#: en/git-notes.txt:56 en/git-worktree.txt:95
#, ignore-same, no-wrap, priority:240
msgid "list"
msgstr "list"
@@ -33548,7 +33901,7 @@ msgid "If conflicts arise and a strategy for automatically resolving conflicting
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:112 en/git-worktree.txt:105
+#: en/git-notes.txt:112 en/git-worktree.txt:122
#, ignore-same, no-wrap, priority:240
msgid "remove"
msgstr "remove"
@@ -33560,7 +33913,7 @@ msgid "Remove the notes for given objects (defaults to HEAD). When giving zero o
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:118 en/git-worktree.txt:101
+#: en/git-notes.txt:118 en/git-worktree.txt:118
#, ignore-same, no-wrap, priority:240
msgid "prune"
msgstr "prune"
@@ -33674,7 +34027,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:360 en/merge-options.txt:119
+#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:119
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33718,7 +34071,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
#, ignore-ellipsis, priority:100
-msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
+msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
#. type: Plain text
@@ -35586,7 +35939,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:855
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35808,7 +36161,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:916
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35820,145 +36173,145 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:923
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:926
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:274
+#: en/git-pack-objects.txt:276
#, priority:100
-msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. This is the default action."
+msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. If the repository is a partial clone, an attempt to fetch missing objects will be made before declaring them missing. This is the default action."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
-#, priority:260
-msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
+#: en/git-pack-objects.txt:280
+#, priority:100
+msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. No fetch of a missing object will occur. Missing objects will silently be omitted from the results."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:282
+#: en/git-pack-objects.txt:285
#, priority:100
-msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing object will raise an error."
+msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. No fetch of a missing object will occur. An unexpected missing object will raise an error."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
+#: en/git-pack-objects.txt:286 en/rev-list-options.txt:941
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
#. type: Plain text
-#: en/git-pack-objects.txt:289
+#: en/git-pack-objects.txt:292
#, priority:100
msgid "Omit objects that are known to be in the promisor remote. (This option has the purpose of operating only on locally created objects, so that when we repack, we still maintain a distinction between locally created objects [without .promisor] and objects from the promisor remote [with .promisor].) This is used with partial clone."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:290 en/git-repack.txt:157
+#: en/git-pack-objects.txt:293 en/git-repack.txt:157
#, ignore-same, no-wrap, priority:100
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:295
+#: en/git-pack-objects.txt:298
#, priority:100
msgid "Objects unreachable from the refs in packs named with --unpacked= option are added to the resulting pack, in addition to the reachable objects that are not in packs marked with *.keep files. This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:296
+#: en/git-pack-objects.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--pack-loose-unreachable"
msgstr "--pack-loose-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:299
+#: en/git-pack-objects.txt:302
#, priority:100
msgid "Pack unreachable loose objects (and their loose counterparts removed). This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:300
+#: en/git-pack-objects.txt:303
#, ignore-same, no-wrap, priority:100
msgid "--unpack-unreachable"
msgstr "--unpack-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:302
+#: en/git-pack-objects.txt:305
#, priority:100
msgid "Keep unreachable objects in loose form. This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:164
+#: en/git-pack-objects.txt:306 en/git-repack.txt:164
#, ignore-same, no-wrap, priority:100
msgid "--delta-islands"
msgstr "--delta-islands"
#. type: Plain text
-#: en/git-pack-objects.txt:306
+#: en/git-pack-objects.txt:309
#, priority:100
msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below."
msgstr ""
#. type: Title -
-#: en/git-pack-objects.txt:309
+#: en/git-pack-objects.txt:312
#, no-wrap, priority:100
msgid "DELTA ISLANDS"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:321
+#: en/git-pack-objects.txt:324
#, priority:100
msgid "When possible, `pack-objects` tries to reuse existing on-disk deltas to avoid having to search for new ones on the fly. This is an important optimization for serving fetches, because it means the server can avoid inflating most objects at all and just send the bytes directly from disk. This optimization can't work when an object is stored as a delta against a base which the receiver does not have (and which we are not already sending). In that case the server \"breaks\" the delta and has to find a new one, which has a high CPU cost. Therefore it's important for performance that the set of objects in on-disk delta relationships match what a client would fetch."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:326
+#: en/git-pack-objects.txt:329
#, priority:100
msgid "In a normal repository, this tends to work automatically. The objects are mostly reachable from the branches and tags, and that's what clients fetch. Any deltas we find on the server are likely to be between objects the client has or will have."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:336
+#: en/git-pack-objects.txt:339
#, priority:100
msgid "But in some repository setups, you may have several related but separate groups of ref tips, with clients tending to fetch those groups independently. For example, imagine that you are hosting several \"forks\" of a repository in a single shared object store, and letting clients view them as separate repositories through `GIT_NAMESPACE` or separate repos using the alternates mechanism. A naive repack may find that the optimal delta for an object is against a base that is only found in another fork. But when a client fetches, they will not have the base object, and we'll have to find a new delta on the fly."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:342
+#: en/git-pack-objects.txt:345
#, priority:100
msgid "A similar situation may exist if you have many refs outside of `refs/heads/` and `refs/tags/` that point to related objects (e.g., `refs/pull` or `refs/changes` used by some hosting providers). By default, clients fetch only heads and tags, and deltas against objects found only in those other groups cannot be sent as-is."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:350
+#: en/git-pack-objects.txt:353
#, priority:100
msgid "Delta islands solve this problem by allowing you to group your refs into distinct \"islands\". Pack-objects computes which objects are reachable from which islands, and refuses to make a delta from an object `A` against a base which is not present in all of `A`'s islands. This results in slightly larger packs (because we miss some delta opportunities), but guarantees that a fetch of one island will not have to recompute deltas on the fly due to crossing island boundaries."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:356
+#: en/git-pack-objects.txt:359
#, priority:100
msgid "When repacking with delta islands the delta window tends to get clogged with candidates that are forbidden by the config. Repacking with a big --window helps (and doesn't take as long as it otherwise might because we can reject some object pairs based on islands before doing any computation on the content)."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:360
+#: en/git-pack-objects.txt:363
#, priority:100
msgid "Islands are configured via the `pack.island` option, which can be specified multiple times. Each value is a left-anchored regular expressions matching refnames. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-pack-objects.txt:365
+#: en/git-pack-objects.txt:368
#, no-wrap, priority:100
msgid ""
"[pack]\n"
@@ -35967,25 +36320,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:372
+#: en/git-pack-objects.txt:375
#, priority:100
msgid "puts heads and tags into an island (whose name is the empty string; see below for more on naming). Any refs which do not match those regular expressions (e.g., `refs/pull/123`) is not in any island. Any object which is reachable only from `refs/pull/` (but not heads or tags) is therefore not a candidate to be used as a base for `refs/heads/`."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:380
+#: en/git-pack-objects.txt:383
#, priority:100
msgid "Refs are grouped into islands based on their \"names\", and two regexes that produce the same name are considered to be in the same island. The names are computed from the regexes by concatenating any capture groups from the regex, with a '-' dash in between. (And if there are no capture groups, then the name is the empty string, as in the above example.) This allows you to create arbitrary numbers of islands. Only up to 14 such capture groups are supported though."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:384
+#: en/git-pack-objects.txt:387
#, priority:100
msgid "For example, imagine you store the refs for each fork in `refs/virtual/ID`, where `ID` is a numeric identifier. You might then configure:"
msgstr ""
#. type: delimited block -
-#: en/git-pack-objects.txt:390
+#: en/git-pack-objects.txt:393
#, no-wrap, priority:100
msgid ""
"[pack]\n"
@@ -35995,19 +36348,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:395
+#: en/git-pack-objects.txt:398
#, priority:100
msgid "That puts the heads and tags for each fork in their own island (named \"1234\" or similar), and the pull refs for each go into their own \"1234-pull\"."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:399
+#: en/git-pack-objects.txt:402
#, priority:100
msgid "Note that we pick a single island for each regex to go into, using \"last one wins\" ordering (which allows repo-specific config to take precedence over user-wide config, and so forth)."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:405
+#: en/git-pack-objects.txt:408
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
@@ -36367,7 +36720,7 @@ msgid "Show progress."
msgstr ""
#. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:229
#, no-wrap, priority:240
msgid "--expire <time>"
msgstr ""
@@ -38687,341 +39040,337 @@ msgid " git rebase --abort\n"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:210
+#: en/git-rebase.txt:211
#, no-wrap, priority:100
msgid "--onto <newbase>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:215
+#: en/git-rebase.txt:216
#, priority:100
msgid "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:219
+#: en/git-rebase.txt:220
#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:220
+#: en/git-rebase.txt:221
#, ignore-same, no-wrap, priority:100
msgid "--keep-base"
msgstr "--keep-base"
#. type: Plain text
-#: en/git-rebase.txt:225
+#: en/git-rebase.txt:226
#, ignore-ellipsis, priority:100
msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:231
#, priority:100
msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:235
+#: en/git-rebase.txt:236
#, priority:100
msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:268 en/git-rebase.txt:287 en/git-rebase.txt:308 en/git-rebase.txt:326 en/git-rebase.txt:334 en/git-rebase.txt:359 en/git-rebase.txt:372 en/git-rebase.txt:381 en/git-rebase.txt:426 en/git-rebase.txt:460 en/git-rebase.txt:468 en/git-rebase.txt:475 en/git-rebase.txt:482 en/git-rebase.txt:494 en/git-rebase.txt:534 en/git-rebase.txt:559 en/git-rebase.txt:571 en/git-rebase.txt:590
+#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288 en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335 en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382 en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484 en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516 en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593 en/git-rebase.txt:612
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:243
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248
+#: en/git-rebase.txt:249
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:255
+#: en/git-rebase.txt:256
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:262
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally). This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#: en/git-rebase.txt:267
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:269
+#: en/git-rebase.txt:270
#, no-wrap, priority:100
msgid "--empty={drop,keep,ask}"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:280
+#: en/git-rebase.txt:281
#, priority:100
msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:285
+#: en/git-rebase.txt:286
#, ignore-ellipsis, priority:100
msgid "Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:288 en/git-rebase.txt:628
+#: en/git-rebase.txt:289 en/git-rebase.txt:647
#, ignore-same, no-wrap, priority:100
msgid "--no-keep-empty"
msgstr "--no-keep-empty"
#. type: Labeled list
-#: en/git-rebase.txt:289
+#: en/git-rebase.txt:290
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:297
+#: en/git-rebase.txt:298
#, priority:100
msgid "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to `git commit`, signifying that a user is very intentionally creating such a commit and thus wants to keep it."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:303
+#: en/git-rebase.txt:304
#, priority:100
msgid "Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don't want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:306
+#: en/git-rebase.txt:307
#, priority:100
msgid "For commits which do not start empty but become empty after rebasing, see the --empty flag."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309 en/git-rebase.txt:630
+#: en/git-rebase.txt:310 en/git-rebase.txt:649
#, ignore-same, no-wrap, priority:100
msgid "--reapply-cherry-picks"
msgstr "--reapply-cherry-picks"
#. type: Labeled list
-#: en/git-rebase.txt:310
+#: en/git-rebase.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--no-reapply-cherry-picks"
msgstr "--no-reapply-cherry-picks"
#. type: Plain text
-#: en/git-rebase.txt:316
+#: en/git-rebase.txt:317
#, priority:100
msgid "Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the `--empty` flag.)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:322
#, priority:100
msgid "By default (or if `--no-reapply-cherry-picks` is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:324
+#: en/git-rebase.txt:325
#, priority:100
msgid "`--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:333
#, priority:100
msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:337
+#: en/git-rebase.txt:338
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:338 en/git-rebase.txt:631
+#: en/git-rebase.txt:339 en/git-rebase.txt:650
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:340
+#: en/git-rebase.txt:341
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:341
+#: en/git-rebase.txt:342
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-rebase.txt:345
+#: en/git-rebase.txt:346
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:352
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:358
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:365
+#: en/git-rebase.txt:366
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:370
+#: en/git-rebase.txt:371
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:373
+#: en/git-rebase.txt:374
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:374
+#: en/git-rebase.txt:375
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:379
+#: en/git-rebase.txt:380
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:400
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:404
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:408
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:411
+#: en/git-rebase.txt:412
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:414
+#: en/git-rebase.txt:415
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:415 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:418
+#: en/git-rebase.txt:419
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:424
+#: en/git-rebase.txt:425
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:427 en/merge-options.txt:43
+#: en/git-rebase.txt:428 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:428
+#: en/git-rebase.txt:429
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:433
+#: en/git-rebase.txt:434
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:440
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:441
+#: en/git-rebase.txt:442
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:445
+#: en/git-rebase.txt:446
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:451
+#: en/git-rebase.txt:452
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:455
#, priority:100
msgid "If <upstream> is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:458
+#: en/git-rebase.txt:459
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
@@ -39029,728 +39378,658 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:466
#, priority:100
-msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
+msgid "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:472
+#, priority:100
+msgid "apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the \"old\" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:477
+#, priority:100
+msgid "merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:482
+#, priority:100
+msgid "This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:473
+#: en/git-rebase.txt:489
#, priority:100
-msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
+msgid "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies `--force-rebase`."
msgstr ""
+#. type: Labeled list
+#: en/git-rebase.txt:491
+#, ignore-same, no-wrap, priority:100
+msgid "--reset-author-date"
+msgstr "--reset-author-date"
+
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:495
+#, priority:100
+msgid "Instead of using the author date of the original commit, use the current time as the\tauthor date of the rebased commit. This option implies `--force-rebase`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:502
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:488
+#: en/git-rebase.txt:510
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:492
+#: en/git-rebase.txt:514
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:496
+#: en/git-rebase.txt:518
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:504
+#: en/git-rebase.txt:526
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:515
+#: en/git-rebase.txt:537
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:543
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523 en/git-rebase.txt:625
+#: en/git-rebase.txt:545 en/git-rebase.txt:644
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:528
+#: en/git-rebase.txt:550
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:554
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:535
+#: en/git-rebase.txt:557
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:558
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:563
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:554
+#: en/git-rebase.txt:576
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:557
+#: en/git-rebase.txt:579
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:594
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:584
+#: en/git-rebase.txt:606
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:610
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:591 en/merge-options.txt:163
+#: en/git-rebase.txt:613 en/merge-options.txt:163
#, ignore-same, no-wrap, priority:240
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-rebase.txt:592 en/merge-options.txt:164
+#: en/git-rebase.txt:614 en/merge-options.txt:164
#, ignore-same, no-wrap, priority:240
msgid "--no-autostash"
msgstr "--no-autostash"
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:621
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:608
+#: en/git-rebase.txt:630
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:633
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:617
+#: en/git-rebase.txt:636
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:639
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:621
+#: en/git-rebase.txt:640
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:642
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:624 en/git-svn.txt:680
+#: en/git-rebase.txt:643 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:646
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:648
#, priority:100
msgid "--empty="
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:651
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:653
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:655
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:656
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:657
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:639
+#: en/git-rebase.txt:658
#, priority:100
msgid "--preserve-merges and --empty="
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:640
+#: en/git-rebase.txt:659
+#, fuzzy, priority:100
+#| msgid "--ignore-whitespace"
+msgid "--preserve-merges and --ignore-whitespace"
+msgstr "--ignore-whitespace"
+
+#. type: Plain text
+#: en/git-rebase.txt:660
+#, fuzzy, priority:100
+#| msgid "--committer-date-is-author-date"
+msgid "--preserve-merges and --committer-date-is-author-date"
+msgstr "--committer-date-is-author-date"
+
+#. type: Plain text
+#: en/git-rebase.txt:661
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --ignore-date"
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:662
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:642
+#: en/git-rebase.txt:664
#, priority:100
msgid "--fork-point and --root"
msgstr ""
-#. type: Plain text
-#: en/git-rebase.txt:644
-#, priority:100
-msgid "BEHAVIORAL DIFFERENCES"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:653
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:656
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:661
+#. type: Title -
+#: en/git-rebase.txt:666
#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:665
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#. type: Plain text
+#: en/git-rebase.txt:675
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:671
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
-#: en/git-rebase.txt:674
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Plain text
+#: en/git-rebase.txt:683
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#. type: Plain text
+#: en/git-rebase.txt:687
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:686
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#. type: Plain text
+#: en/git-rebase.txt:693
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:689
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:704
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#. type: Plain text
+#: en/git-rebase.txt:705
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:707
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#. type: Plain text
+#: en/git-rebase.txt:708
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
+#. type: Title ~
#: en/git-rebase.txt:710
-#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
+
+#. type: Plain text
+#: en/git-rebase.txt:726
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:721
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#. type: Plain text
+#: en/git-rebase.txt:729
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:724
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:727
-#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+#. type: Plain text
+#: en/git-rebase.txt:743
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:740
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#. type: Plain text
+#: en/git-rebase.txt:746
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:743
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:751
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#. type: Plain text
+#: en/git-rebase.txt:762
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:754
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:761
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#. type: Plain text
+#: en/git-rebase.txt:773
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:764
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:768
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#. type: Plain text
+#: en/git-rebase.txt:783
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:772
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:778
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#. type: Plain text
+#: en/git-rebase.txt:790
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:781
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+#. type: Plain text
+#: en/git-rebase.txt:794
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
+#. type: Plain text
+#: en/git-rebase.txt:800
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:785
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#. type: Plain text
+#: en/git-rebase.txt:803
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:790
+#: en/git-rebase.txt:812
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:795
+#: en/git-rebase.txt:817
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:806
+#: en/git-rebase.txt:828
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:831
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:810
+#: en/git-rebase.txt:832
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:811
+#: en/git-rebase.txt:833
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:813
+#: en/git-rebase.txt:835
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:817
+#: en/git-rebase.txt:839
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:818 en/git-update-ref.txt:135
+#: en/git-rebase.txt:840 en/git-update-ref.txt:135
#, no-wrap, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:820
+#: en/git-rebase.txt:842
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:823
+#: en/git-rebase.txt:845
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:832
+#: en/git-rebase.txt:854
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:834
+#: en/git-rebase.txt:856
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:861
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:866
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39759,73 +40038,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:849
+#: en/git-rebase.txt:871
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:854
+#: en/git-rebase.txt:876
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:857
+#: en/git-rebase.txt:879
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:860
+#: en/git-rebase.txt:882
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:863
+#: en/git-rebase.txt:885
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:893
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:897
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:879
+#: en/git-rebase.txt:901
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:882
+#: en/git-rebase.txt:904
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:907
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:910
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:917
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39836,25 +40115,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:921
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:902
+#: en/git-rebase.txt:924
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:931
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:940
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39867,31 +40146,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:923
+#: en/git-rebase.txt:945
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:928
+#: en/git-rebase.txt:950
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:931
+#: en/git-rebase.txt:953
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:957
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:967
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39905,85 +40184,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:948
+#: en/git-rebase.txt:970
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:976
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:958
+#: en/git-rebase.txt:980
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:960
+#: en/git-rebase.txt:982
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:986
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:968
+#: en/git-rebase.txt:990
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:971
+#: en/git-rebase.txt:993
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:995
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:997
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:980
+#: en/git-rebase.txt:1002
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:983
+#: en/git-rebase.txt:1005
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:990
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:995
+#: en/git-rebase.txt:1017
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1002
+#: en/git-rebase.txt:1024
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -39994,13 +40273,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1005
+#: en/git-rebase.txt:1027
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1034
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40011,13 +40290,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1016
+#: en/git-rebase.txt:1038
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1023
+#: en/git-rebase.txt:1045
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40028,73 +40307,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1030
+#: en/git-rebase.txt:1052
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1054
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:1033
+#: en/git-rebase.txt:1055
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1059
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1060
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1067
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:1048
+#: en/git-rebase.txt:1070
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1053
+#: en/git-rebase.txt:1075
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1080
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream (unless `--reapply-cherry-picks` is given). So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1082
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1084
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1090
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40105,19 +40384,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1094
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1076
+#: en/git-rebase.txt:1098
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1081
+#: en/git-rebase.txt:1103
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -40127,67 +40406,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1086
+#: en/git-rebase.txt:1108
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1090
+#: en/git-rebase.txt:1112
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1093
+#: en/git-rebase.txt:1115
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1096
+#: en/git-rebase.txt:1118
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1098
+#: en/git-rebase.txt:1120
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1103
+#: en/git-rebase.txt:1125
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:1105
+#: en/git-rebase.txt:1127
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1113
+#: en/git-rebase.txt:1135
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1117
+#: en/git-rebase.txt:1139
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1122
+#: en/git-rebase.txt:1144
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1132
+#: en/git-rebase.txt:1154
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -40201,25 +40480,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1139
+#: en/git-rebase.txt:1161
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1142
+#: en/git-rebase.txt:1164
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1145 en/git-rebase.txt:1222
+#: en/git-rebase.txt:1167 en/git-rebase.txt:1244
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1151
+#: en/git-rebase.txt:1173
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -40230,7 +40509,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1156
+#: en/git-rebase.txt:1178
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -40240,7 +40519,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1160
+#: en/git-rebase.txt:1182
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40249,55 +40528,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1164
+#: en/git-rebase.txt:1186
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1172
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1179
+#: en/git-rebase.txt:1201
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1185
+#: en/git-rebase.txt:1207
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1188
+#: en/git-rebase.txt:1210
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1195
+#: en/git-rebase.txt:1217
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1199
+#: en/git-rebase.txt:1221
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1206
+#: en/git-rebase.txt:1228
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1213
+#: en/git-rebase.txt:1235
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -40308,13 +40587,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1219
+#: en/git-rebase.txt:1241
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1225
+#: en/git-rebase.txt:1247
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -40322,7 +40601,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1232
+#: en/git-rebase.txt:1254
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40334,7 +40613,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1236
+#: en/git-rebase.txt:1258
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40343,37 +40622,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1245
+#: en/git-rebase.txt:1267
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1247
+#: en/git-rebase.txt:1269
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1249
+#: en/git-rebase.txt:1271
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1253
+#: en/git-rebase.txt:1275
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1255
+#: en/git-rebase.txt:1277
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1259
+#: en/git-rebase.txt:1281
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -40888,7 +41167,7 @@ msgid "Process the reflogs of all references."
msgstr ""
#. type: Labeled list
-#: en/git-reflog.txt:75 en/rev-list-options.txt:193
+#: en/git-reflog.txt:75 en/rev-list-options.txt:192
#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr "--single-worktree"
@@ -41629,7 +41908,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter `remote.<name>.skipDefaultUpdate` set to true will be updated. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -43689,65 +43968,7 @@ msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:21
-#, priority:100
-msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:28
-#, priority:100
-msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:30
-#, priority:100
-msgid "Thus, the following command:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:33
-#, no-wrap, priority:100
-msgid "\t$ git rev-list foo bar ^baz\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:37
-#, priority:100
-msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:41
-#, priority:100
-msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:45
-#, no-wrap, priority:100
-msgid ""
-"\t$ git rev-list origin..HEAD\n"
-"\t$ git rev-list HEAD ^origin\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:50
-#, ignore-ellipsis, priority:100
-msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
-"\t$ git rev-list A...B\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:61
+#: en/git-rev-list.txt:25
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44093,19 +44314,19 @@ msgid "Show all refs matching the shell glob pattern `pattern`. If the pattern d
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:182 en/rev-list-options.txt:166
+#: en/git-rev-parse.txt:182 en/rev-list-options.txt:165
#, no-wrap, priority:260
msgid "--exclude=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
+#: en/git-rev-parse.txt:189 en/rev-list-options.txt:173
#, priority:260
msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:195 en/rev-list-options.txt:180
+#: en/git-rev-parse.txt:195 en/rev-list-options.txt:179
#, priority:260
msgid "The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly."
msgstr ""
@@ -46388,49 +46609,98 @@ msgid "Each pretty-printed commit will be rewrapped before it is shown."
msgstr ""
#. type: Labeled list
-#: en/git-shortlog.txt:51
+#: en/git-shortlog.txt:50
+#, fuzzy, no-wrap, priority:260
+#| msgid "--no-type"
+msgid "--group=<type>"
+msgstr "--no-type"
+
+#. type: Plain text
+#: en/git-shortlog.txt:53
+#, priority:260
+msgid "Group commits based on `<type>`. If no `--group` option is specified, the default is `author`. `<type>` is one of:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:56
+#, priority:260
+msgid "`author`, commits are grouped by author"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:57
+#, priority:260
+msgid "`committer`, commits are grouped by committer (the same as `-c`)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:62
+#, priority:260
+msgid "`trailer:<field>`, the `<field>` is interpreted as a case-insensitive commit message trailer (see linkgit:git-interpret-trailers[1]). For example, if your project uses `Reviewed-by` trailers, you might want to see who has been reviewing with `git shortlog -ns --group=trailer:reviewed-by`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:67
+#, priority:260
+msgid "Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:72
+#, priority:260
+msgid "Shortlog will attempt to parse each trailer value as a `name <email>` identity. If successful, the mailmap is applied and the email is omitted unless the `--email` option is specified. If the value cannot be parsed as an identity, it will be taken literally and completely."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:78
+#, priority:260
+msgid "If `--group` is specified multiple times, commits are counted under each value (but again, only once per unique value in that commit). For example, `git shortlog --group=author --group=trailer:co-authored-by` counts both authors and co-authors."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-shortlog.txt:80
#, ignore-same, no-wrap, priority:260
msgid "--committer"
msgstr "--committer"
#. type: Plain text
-#: en/git-shortlog.txt:53
+#: en/git-shortlog.txt:82
#, priority:260
-msgid "Collect and show committer identities instead of authors."
+msgid "This is an alias for `--group=committer`."
msgstr ""
#. type: Labeled list
-#: en/git-shortlog.txt:54
+#: en/git-shortlog.txt:83
#, no-wrap, priority:260
msgid "-w[<width>[,<indent1>[,<indent2>]]]"
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:59
+#: en/git-shortlog.txt:88
#, priority:260
msgid "Linewrap the output by wrapping each line at `width`. The first line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:62
+#: en/git-shortlog.txt:91
#, priority:260
msgid "If width is `0` (zero) then indent the lines of the output without wrapping them."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:71
+#: en/git-shortlog.txt:100
#, 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: Plain text
-#: en/git-shortlog.txt:75
+#: en/git-shortlog.txt:104
#, priority:260
msgid "Consider only commits that are enough to explain how the files that match the specified paths came to be."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:88
+#: en/git-shortlog.txt:117
#, priority:260
msgid "The `.mailmap` feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently."
msgstr ""
@@ -46526,7 +46796,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:790
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46538,7 +46808,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:782
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -46757,7 +47027,7 @@ msgstr ""
#. type: Plain text
#: en/git-show-index.txt:13
#, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
msgstr ""
#. type: Plain text
@@ -46796,6 +47066,13 @@ msgstr ""
msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
msgstr ""
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file. The valid values are 'sha1' and (if enabled) 'sha256'. The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "Gefa upp snið viðkomandi viðfangs (reikniforskrift mylnuskrár) fyrir hirsluna. Gild gildi eru 'sha1' og (ef virkt) 'sha256'. Forstillingin er 'sha1'."
+
#. type: Title =
#: en/git-show-ref.txt:2
#, ignore-same, no-wrap, priority:100
@@ -47158,6 +47435,12 @@ msgstr ""
msgid "The names of objects to show (defaults to 'HEAD'). For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
+#. type: Title -
+#: en/git-show.txt:49
+#, no-wrap, priority:260
+msgid "COMMON DIFF OPTIONS"
+msgstr ""
+
#. type: Labeled list
#: en/git-show.txt:60
#, no-wrap, priority:260
@@ -48870,16 +49153,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -48894,28 +49171,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -48930,20 +49195,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -48979,7 +49234,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:187
#, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
msgstr ""
#. type: Labeled list
@@ -49111,7 +49366,7 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:288
#, priority:220
-msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to the remote 'HEAD'."
msgstr ""
#. type: Plain text
@@ -49159,7 +49414,7 @@ msgstr "--remote"
#. type: Plain text
#: en/git-submodule.txt:329
#, priority:220
-msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
#. type: Plain text
@@ -49960,7 +50215,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1048
+#: en/git-svn.txt:346 en/rev-list-options.txt:1047
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -51693,7 +51948,7 @@ msgid ""
"'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
"\t[--points-at <object>] [--column[=<options>] | --no-column]\n"
"\t[--create-reflog] [--sort=<key>] [--format=<format>]\n"
-"\t[--[no-]merged [<commit>]] [<pattern>...]\n"
+"\t[--merged <commit>] [--no-merged <commit>] [<pattern>...]\n"
"'git tag' -v [--format=<format>] <tagname>...\n"
msgstr ""
@@ -51886,13 +52141,13 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:153
#, priority:240
-msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
+msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified)."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:157
#, priority:240
-msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
+msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified)."
msgstr ""
#. type: Plain text
@@ -51950,7 +52205,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:348
+#: en/git-tag.txt:209 en/git.txt:355
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -52192,7 +52447,7 @@ msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:384
+#: en/git-tag.txt:389
#, priority:240
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr ""
@@ -52692,19 +52947,32 @@ msgid "These are internal helper commands used by other commands; end users typi
msgstr ""
#. type: Title -
-#: en/git.txt:309
+#: en/git.txt:308
+#, fuzzy, no-wrap, priority:100
+#| msgid "--guides"
+msgid "Guides"
+msgstr "--guides"
+
+#. type: Plain text
+#: en/git.txt:311
+#, priority:100
+msgid "The following documentation pages are guides about Git concepts."
+msgstr ""
+
+#. type: Title -
+#: en/git.txt:316
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:314
+#: en/git.txt:321
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:319
+#: en/git.txt:326
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52713,7 +52981,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:329
+#: en/git.txt:336
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52723,661 +52991,667 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:335
+#: en/git.txt:342
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:338
+#: en/git.txt:345
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:341
+#: en/git.txt:348
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:342 en/git-unpack-file.txt:23
+#: en/git.txt:349 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:344
+#: en/git.txt:351
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:347
+#: en/git.txt:354
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:350
+#: en/git.txt:357
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:363
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:357
+#: en/git.txt:364
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:362
+#: en/git.txt:369
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:366
+#: en/git.txt:373
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:370
+#: en/git.txt:377
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:372
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:382
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:378
+#: en/git.txt:385
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:379
+#: en/git.txt:386
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:382
+#: en/git.txt:389
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:393
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:389
+#: en/git.txt:396
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:392
+#: en/git.txt:399
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:395
+#: en/git.txt:402
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:397
+#: en/git.txt:404
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:400
+#: en/git.txt:407
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:403
+#: en/git.txt:410
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:405
+#: en/git.txt:412
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:410
+#: en/git.txt:417
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:412
+#: en/git.txt:419
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:416
+#: en/git.txt:423
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:417
+#: en/git.txt:424
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:421
+#: en/git.txt:428
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:422
+#: en/git.txt:429
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:427
+#: en/git.txt:434
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:428
+#: en/git.txt:435
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:433
+#: en/git.txt:440
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:434
+#: en/git.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:440
+#: en/git.txt:447
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:446
+#: en/git.txt:453
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:447
+#: en/git.txt:454
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:452
+#: en/git.txt:459
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:453
+#: en/git.txt:460
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:457
+#: en/git.txt:464
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:458
+#: en/git.txt:465
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:461
+#: en/git.txt:468
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:462
+#: en/git.txt:469
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:476
+#: en/git.txt:483
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:477
+#: en/git.txt:484
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:486
+#: en/git.txt:493
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:494
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:495
+#: en/git.txt:502
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Labeled list
-#: en/git.txt:496
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DEFAULT_HASH`"
msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
-#: en/git.txt:501
+#: en/git.txt:509
#, priority:100
-msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\"."
+msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]."
msgstr ""
#. type: Title ~
-#: en/git.txt:503
+#: en/git.txt:511
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:504
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:516
#, priority:100
msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:509
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:521
#, priority:100
msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Plain text
-#: en/git.txt:517
+#: en/git.txt:525
#, priority:100
msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
#. type: Labeled list
-#: en/git.txt:518
+#: en/git.txt:526
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Plain text
-#: en/git.txt:522
+#: en/git.txt:530
#, priority:100
msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:523
+#: en/git.txt:531
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:535
#, priority:100
msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:536
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
#. type: Plain text
-#: en/git.txt:531
+#: en/git.txt:539
#, priority:100
msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
#. type: Labeled list
-#: en/git.txt:532
+#: en/git.txt:540
#, ignore-same, no-wrap, priority:100
msgid "`EMAIL`"
msgstr "`EMAIL`"
#. type: Plain text
-#: en/git.txt:535
+#: en/git.txt:543
#, priority:100
msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:537
+#: en/git.txt:545
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:538
+#: en/git.txt:546
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:543
+#: en/git.txt:551
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:544
+#: en/git.txt:552
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:549
+#: en/git.txt:558
#, priority:100
-msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
+msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called to generate diffs, and Git does not use its builtin diff machinery. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:551
+#: en/git.txt:560
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:553
+#: en/git.txt:562
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:554
+#: en/git.txt:563
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:555
+#: en/git.txt:565
#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
-#. type: Plain text
-#: en/git.txt:556
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:556
+#: en/git.txt:565
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:557
+#: en/git.txt:566
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:566
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:558
+#: en/git.txt:567
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:564
+#: en/git.txt:573
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:567
+#: en/git.txt:576
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:570
+#: en/git.txt:579
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:571
+#: en/git.txt:580
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:573
+#: en/git.txt:582
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:574
+#: en/git.txt:583
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:576
+#: en/git.txt:585
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:579
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:583
+#: en/git.txt:592
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:584
+#: en/git.txt:593
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:589
+#: en/git.txt:598
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:590
+#: en/git.txt:599
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:593
+#: en/git.txt:602
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:594
+#: en/git.txt:603
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:599
+#: en/git.txt:608
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:600
+#: en/git.txt:609
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_SEQUENCE_EDITOR`"
+msgstr "`GIT_SEQUENCE_EDITOR`"
+
+#. type: Plain text
+#: en/git.txt:614
+#, priority:100
+msgid "This environment variable overrides the configured Git editor when editing the todo list of an interactive rebase. See also linkit::git-rebase[1] and the `sequence.editor` option in linkit::git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:616
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:608
+#: en/git.txt:623
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:614
+#: en/git.txt:629
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:618
+#: en/git.txt:633
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:619
+#: en/git.txt:634
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:624
+#: en/git.txt:639
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:625
+#: en/git.txt:640
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:631
+#: en/git.txt:646
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:632
+#: en/git.txt:647
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:635
+#: en/git.txt:650
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:636
+#: en/git.txt:651
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:658
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:659
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:654
+#: en/git.txt:669
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -53392,523 +53666,535 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:655
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:673
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:677 en/git.txt:757
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:682 en/git.txt:762
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:672
+#: en/git.txt:687
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:690 en/git.txt:779
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:676
+#: en/git.txt:691
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:679
+#: en/git.txt:694
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:680
+#: en/git.txt:695
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:686
+#: en/git.txt:701
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:687
+#: en/git.txt:702
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:694
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:701
+#: en/git.txt:716
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:704
+#: en/git.txt:719
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:705
+#: en/git.txt:720
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:709
+#: en/git.txt:724
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:710
+#: en/git.txt:725
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_TRACE_REFS`"
+msgstr "`GIT_TRACE_REFS`"
+
+#. type: Plain text
+#: en/git.txt:728
+#, priority:100
+msgid "Enables trace messages for operations on the ref database. See `GIT_TRACE` for available trace output options."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:729
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:714
+#: en/git.txt:733
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:715
+#: en/git.txt:734
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:719
+#: en/git.txt:738
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:720
+#: en/git.txt:739
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:744
#, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. This option overrides setting the `GIT_CURL_VERBOSE` environment variable. See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:745
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:748
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:749
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:753
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:771
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:776
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:782
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:784
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:789
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:790
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:796
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
#. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:801
#, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
msgstr ""
#. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:802
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:810
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:814
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:815
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:818
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:819
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:822
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:832
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:833
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:843
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:852
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:859
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:860
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:865
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:866
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:873
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:874
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:875
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:876
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:886
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:891
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:892
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:900
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:886
+#: en/git.txt:902
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:907
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:914
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:919
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:924
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:930
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:933
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:940
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:949
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:953
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:939
+#: en/git.txt:955
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:960
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:964
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:966
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:969
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:972
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:975
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:962
+#: en/git.txt:978
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:983
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:987
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:973
+#: en/git.txt:989
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:996
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:999
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:1007
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -53982,16 +54268,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54090,16 +54370,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54114,22 +54388,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55152,43 +55414,43 @@ msgid "LOGGING UPDATES"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:157
+#: en/git-update-ref.txt:158
#, priority:100
-msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
+msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or a pseudoref like HEAD or ORIG_HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:159
+#: en/git-update-ref.txt:160
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:164
+#: en/git-update-ref.txt:165
#, priority:100
msgid "Where \"oldsha1\" is the 40 character hexadecimal value previously stored in <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and \"committer\" is the committer's name, email address and date in the standard Git committer ident format."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:166
+#: en/git-update-ref.txt:167
#, priority:100
msgid "Optionally with -m:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:168
+#: en/git-update-ref.txt:169
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer TAB message LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:171
+#: en/git-update-ref.txt:172
#, priority:100
msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:175
+#: en/git-update-ref.txt:176
#, priority:100
msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
msgstr ""
@@ -56030,8 +56292,8 @@ msgid "git-worktree - Manage multiple working trees"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:19
-#, no-wrap, priority:240
+#: 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 list' [--porcelain]\n"
@@ -56039,413 +56301,450 @@ msgid ""
"'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"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:24
+#: en/git-worktree.txt:25
#, priority:240
msgid "Manage multiple working trees attached to the same repository."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:32
+#: en/git-worktree.txt:34
+#, priority:240
+msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1]. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:46
#, priority:240
-msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\". A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
+msgid "In its simplest form, `git worktree add <path>` automatically creates a new branch whose name is the final component of `<path>`, which is convenient if you plan to work on a new topic. For instance, `git worktree add ../hotfix` creates new branch `hotfix` and checks it out at path `../hotfix`. To instead work on an existing branch in a new working tree, use `git worktree add <path> <branch>`. On the other hand, if you just plan to make some experimental changes or do testing without disturbing existing development, it is often convenient to create a 'throwaway' working tree not associated with any branch. For instance, `git worktree add -d <path>` creates a new working tree with a detached `HEAD` at the same commit as the current branch."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:39
+#: en/git-worktree.txt:53
#, priority:240
msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:44
+#: en/git-worktree.txt:58
#, priority:240
msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:47
+#: en/git-worktree.txt:61
#, no-wrap, priority:240
msgid "add <path> [<commit-ish>]"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:53
+#: en/git-worktree.txt:67
#, priority:240
-msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<commit-ish>`; it is synonymous with `@{-1}`."
+msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may be a bare \"`-`\", which is synonymous with `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:58
+#: en/git-worktree.txt:72
#, priority:240
-msgid "If <commit-ish> is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
+msgid "If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:61
+#: en/git-worktree.txt:75
#, no-wrap, priority:240
msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:80
+#: en/git-worktree.txt:85
#, priority:240
-msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on HEAD is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
+msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the `origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:87
+#: en/git-worktree.txt:94
#, priority:240
-msgid "List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
+msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new working tree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new working tree, if it's not checked out anywhere else, otherwise the command will refuse to create the working tree (unless `--force` is used)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:101
+#, priority:240
+msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, and the branch currently checked out (or \"detached HEAD\" if none)."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:88
+#: en/git-worktree.txt:102
#, ignore-same, no-wrap, priority:240
msgid "lock"
msgstr "lock"
#. type: Plain text
-#: en/git-worktree.txt:95
+#: en/git-worktree.txt:109
#, priority:240
msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:96
+#: en/git-worktree.txt:110
#, ignore-same, no-wrap, priority:240
msgid "move"
msgstr "move"
#. type: Plain text
-#: en/git-worktree.txt:100
+#: en/git-worktree.txt:117
#, priority:240
-msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved."
+msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked working trees if you move the main working tree manually.)"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:104
+#: en/git-worktree.txt:121
#, priority:240
-msgid "Prune working tree information in $GIT_DIR/worktrees."
+msgid "Prune working tree information in `$GIT_DIR/worktrees`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:111
+#: en/git-worktree.txt:128
#, priority:240
msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:112
+#: en/git-worktree.txt:129
+#, ignore-ellipsis, no-wrap, priority:240
+msgid "repair [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:133
+#, priority:240
+msgid "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:138
+#, priority:240
+msgid "For instance, if the main working tree (or bare repository) is moved, linked working trees will be unable to locate it. Running `repair` in the main working tree will reestablish the connection from linked working trees back to the main working tree."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:145
+#, priority:240
+msgid "Similarly, if a linked working tree is moved without using `git worktree move`, the main working tree (or bare repository) will be unable to locate it. Running `repair` within the recently-moved working tree will reestablish the connection. If multiple linked working trees are moved, running `repair` from any working tree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-worktree.txt:146
#, ignore-same, no-wrap, priority:240
msgid "unlock"
msgstr "unlock"
#. type: Plain text
-#: en/git-worktree.txt:115
+#: en/git-worktree.txt:149
#, priority:240
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:127
+#: en/git-worktree.txt:161
#, priority:240
msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:166
#, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:169
#, priority:240
msgid "`remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:170
#, no-wrap, priority:240
msgid "-b <new-branch>"
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:171
#, no-wrap, priority:240
msgid "-B <new-branch>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:178
#, priority:240
-msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
+msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:183
#, priority:240
-msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
+msgid "With `add`, detach `HEAD` in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:184
#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:189
#, priority:240
msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:190
#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
#. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:196
#, priority:240
-msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
+msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:199
#, priority:240
msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:200
#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr "--[no-]track"
#. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:205
#, priority:240
-msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See \"--track\" in linkgit:git-branch[1] for details."
+msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:206
#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr "--lock"
#. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:210
#, priority:240
-msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
+msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:215
#, priority:240
msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:220
#, priority:240
msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:224
#, priority:240
-msgid "With 'add', suppress feedback messages."
+msgid "With `add`, suppress feedback messages."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:228
#, priority:240
msgid "With `prune`, report all removals."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:231
#, priority:240
-msgid "With `prune`, only expire unused working trees older than <time>."
+msgid "With `prune`, only expire unused working trees older than `<time>`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:232
#, no-wrap, priority:240
msgid "--reason <string>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:234
#, priority:240
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:235
#, no-wrap, priority:240
msgid "<worktree>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:238
#, priority:240
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:243
#, priority:240
-msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
+msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify a working tree. For example if you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former working tree."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:245
#, no-wrap, priority:240
msgid "REFS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:250
#, priority:240
-msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
+msgid "In multiple working trees, some refs may be shared between all working trees and some refs are local. One example is `HEAD` which is different for each working tree. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:256
#, priority:240
-msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
+msgid "In general, all pseudo refs are per working tree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:261
#, priority:240
-msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
+msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:268
#, priority:240
-msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
+msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main working tree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:272
#, priority:240
-msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
+msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:279
#, priority:240
-msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
+msgid "By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:282
#, priority:240
-msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
+msgid "In order to have configuration specific to working trees, you can turn on the `worktreeConfig` extension, e.g.:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:285
#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:291
#, priority:240
msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:297
#, priority:240
-msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
+msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:299
#, priority:240
msgid "`core.worktree` and `core.bare` should never be shared"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:302
#, priority:240
msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:304
#, no-wrap, priority:240
msgid "DETAILS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:313
#, priority:240
-msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
+msgid "Each linked working tree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:319
#, priority:240
-msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
+msgid "Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:329
#, priority:240
-msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
+msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except `refs/bisect` and `refs/worktree`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:334
#, priority:240
-msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
+msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:342
#, priority:240
-msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
+msgid "If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:353
#, priority:240
-msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
+msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:356
#, priority:240
-msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
+msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:358
#, no-wrap, priority:240
msgid "LIST OUTPUT FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:361
#, priority:240
-msgid "The worktree list command has two output formats. The default format shows the details on a single line with columns. For example:"
+msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:367
#, no-wrap, priority:240
msgid ""
"$ git worktree list\n"
@@ -56455,19 +56754,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:370
#, no-wrap, priority:240
msgid "Porcelain Format"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:376
#, priority:240
-msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true. The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record. For example:"
+msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. The first attribute of a working tree is always `worktree`, an empty line indicates the end of the record. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:381
#, no-wrap, priority:240
msgid ""
"$ git worktree list --porcelain\n"
@@ -56476,7 +56775,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:385
#, no-wrap, priority:240
msgid ""
"worktree /path/to/linked-worktree\n"
@@ -56485,7 +56784,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:389
#, no-wrap, priority:240
msgid ""
"worktree /path/to/other-linked-worktree\n"
@@ -56494,13 +56793,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:402
#, priority:240
msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:410
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
@@ -56512,7 +56811,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:417
#, priority:240
msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
@@ -58647,60 +58946,81 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:18
+#, fuzzy, priority:240
+#| msgid "vimdiff"
+msgid "nvimdiff"
+msgstr "vimdiff"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:19
+#, fuzzy, priority:240
+#| msgid "vimdiff2"
+msgid "nvimdiff2"
+msgstr "vimdiff2"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:20
+#, fuzzy, priority:240
+#| msgid "vimdiff3"
+msgid "nvimdiff3"
+msgstr "vimdiff3"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:21
#, ignore-same, priority:240
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
-#: en/mergetools-merge.txt:19
+#: en/mergetools-merge.txt:22
#, ignore-same, priority:240
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
-#: en/mergetools-merge.txt:20
+#: en/mergetools-merge.txt:23
#, ignore-same, priority:240
msgid "smerge"
msgstr "smerge"
#. type: Plain text
-#: en/mergetools-merge.txt:21
+#: en/mergetools-merge.txt:24
#, ignore-same, priority:240
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:22
+#: en/mergetools-merge.txt:25
#, ignore-same, priority:240
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
-#: en/mergetools-merge.txt:23
+#: en/mergetools-merge.txt:26
#, ignore-same, priority:240
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:27
#, ignore-same, priority:240
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
-#: en/mergetools-merge.txt:25
+#: en/mergetools-merge.txt:28
#, ignore-same, priority:240
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
-#: en/mergetools-merge.txt:26
+#: en/mergetools-merge.txt:29
#, ignore-same, priority:240
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
-#: en/mergetools-merge.txt:26
+#: en/mergetools-merge.txt:29
#, ignore-same, priority:240
msgid "xxdiff"
msgstr "xxdiff"
@@ -59000,16 +59320,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59031,33 +59345,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59066,16 +59368,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59084,16 +59380,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59102,16 +59392,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59120,16 +59404,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59229,15 +59507,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59259,9 +59531,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59271,7 +59543,7 @@ msgid "'%al'"
msgstr "'%al'"
#. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
#, priority:260
msgid "author email local-part (the part before the '@' sign)"
msgstr ""
@@ -59283,15 +59555,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59397,9 +59663,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59421,9 +59687,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59432,6 +59698,12 @@ msgstr ""
msgid "'%cl'"
msgstr "'%cl'"
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
#. type: Labeled list
#: en/pretty-formats.txt:200
#, ignore-same, no-wrap, priority:260
@@ -59439,9 +59711,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59552,16 +59824,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -59648,16 +59914,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -59702,16 +59962,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -59732,16 +59986,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59750,16 +59998,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -59781,9 +60023,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59805,9 +60047,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59828,16 +60070,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -59991,7 +60227,7 @@ msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
#, priority:260
-msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
+msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit`, either explicit or implied by other options such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
@@ -60147,55 +60383,67 @@ msgid "The format of a <refspec> parameter is an optional plus `+`, followed by
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:35
+#: en/pull-fetch-param.txt:38
+#, priority:220
+msgid "A <refspec> may contain a `*` in its <src> to indicate a simple pattern match. Such a refspec functions like a glob that matches any ref with the same prefix. A pattern <refspec> must have a `*` in both the <src> and <dst>. It will map refs to the destination by replacing the `*` with the contents matched from the source."
+msgstr ""
+
+#. type: Plain text
+#: en/pull-fetch-param.txt:48
+#, priority:220
+msgid "If a refspec is prefixed by `^`, it will be interpreted as a negative refspec. Rather than specifying which refs to fetch or which local refs to update, such a refspec will instead specify refs to exclude. A ref will be considered to match if it matches at least one positive refspec, and does not match any negative refspec. Negative refspecs can be useful to restrict the scope of a pattern refspec so that it will not include specific refs. Negative refspecs can themselves be pattern refspecs. However, they may only contain a <src> and do not specify a <dst>. Fully spelled out hex object names are also not supported."
+msgstr ""
+
+#. type: Plain text
+#: en/pull-fetch-param.txt:51
#, priority:220
msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:39
+#: en/pull-fetch-param.txt:55
#, priority:220
msgid "The remote ref that matches <src> is fetched, and if <dst> is not an empty string, an attempt is made to update the local ref that matches it."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:46
+#: en/pull-fetch-param.txt:62
#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:54
+#: en/pull-fetch-param.txt:70
#, priority:220
msgid "Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`)."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:60
+#: en/pull-fetch-param.txt:76
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or a commit for another commit that's doesn't have the previous commit as an ancestor etc."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:64
+#: en/pull-fetch-param.txt:80
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], there is no configuration which'll amend these rules, and nothing like a `pre-fetch` hook analogous to the `pre-receive` hook."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:71
+#: en/pull-fetch-param.txt:87
#, priority:220
msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:83
+#: en/pull-fetch-param.txt:99
#, priority:220
msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:103
+#: en/pull-fetch-param.txt:119
#, priority:220
msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
msgstr ""
@@ -60590,197 +60838,203 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:259
#, priority:100
+msgid "Specifying several revisions means the set of commits reachable from any of the given commits."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:262
+#, priority:100
msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:262
+#: en/revisions.txt:265
#, no-wrap, priority:100
msgid "Commit Exclusions"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:264
+#: en/revisions.txt:267
#, no-wrap, priority:100
msgid "'{caret}<rev>' (caret) Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:269
+#: en/revisions.txt:272
#, 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:271
+#: en/revisions.txt:274
#, no-wrap, priority:100
msgid "Dotted Range Notations"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:273
+#: en/revisions.txt:276
#, no-wrap, priority:100
msgid "The '..' (two-dot) Range Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:279
+#: en/revisions.txt:282
#, 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:280
+#: en/revisions.txt:283
#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:286
+#: en/revisions.txt:289
#, 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:293
+#: en/revisions.txt:296
#, priority:100
msgid "In these two shorthand notations, you can omit one end and let it default to HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks \"What did I do since I forked from the origin branch?\" Similarly, '..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:295
+#: en/revisions.txt:298
#, no-wrap, priority:100
msgid "Other <rev>{caret} Parent Shorthand Notations"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:298
+#: en/revisions.txt:301
#, 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:300
+#: en/revisions.txt:303
#, priority:100
msgid "The 'r1{caret}@' notation means all parents of 'r1'."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:303
+#: en/revisions.txt:306
#, 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:310
+#: en/revisions.txt:313
#, 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:314
+#: en/revisions.txt:317
#, 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:316
+#: en/revisions.txt:319
#, no-wrap, priority:100
msgid "Revision Range Summary"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:318
+#: en/revisions.txt:321
#, no-wrap, priority:100
msgid "'<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:321
+#: en/revisions.txt:324
#, priority:100
msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:322
+#: en/revisions.txt:325
#, no-wrap, priority:100
msgid "'{caret}<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:325
+#: en/revisions.txt:328
#, priority:100
msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:326
+#: en/revisions.txt:329
#, no-wrap, priority:100
msgid "'<rev1>..<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:330
+#: en/revisions.txt:333
#, 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:331
+#: en/revisions.txt:334
#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:335
+#: en/revisions.txt:338
#, 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:336
+#: en/revisions.txt:339
#, no-wrap, priority:100
msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:340
+#: en/revisions.txt:343
#, 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:341
+#: en/revisions.txt:344
#, no-wrap, priority:100
msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:345
+#: en/revisions.txt:348
#, 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:346
+#: en/revisions.txt:349
#, no-wrap, priority:100
msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:349
+#: en/revisions.txt:352
#, priority:100
msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:353
+#: en/revisions.txt:356
#, 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:377
+#: en/revisions.txt:380
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
@@ -61096,445 +61350,445 @@ msgid "`--no-min-parents` and `--no-max-parents` reset these limits (to no limit
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:133
+#: en/rev-list-options.txt:132
#, priority:260
-msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:137
+#: en/rev-list-options.txt:136
#, priority:260
msgid "Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:141
+#: en/rev-list-options.txt:140
#, priority:260
msgid "Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the command line as '<commit>'."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:142
+#: en/rev-list-options.txt:141
#, no-wrap, priority:260
msgid "--branches[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:147
+#: en/rev-list-options.txt:146
#, priority:260
msgid "Pretend as if all the refs in `refs/heads` are listed on the command line as '<commit>'. If '<pattern>' is given, limit branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:148
+#: en/rev-list-options.txt:147
#, no-wrap, priority:260
msgid "--tags[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:153
+#: en/rev-list-options.txt:152
#, priority:260
msgid "Pretend as if all the refs in `refs/tags` are listed on the command line as '<commit>'. If '<pattern>' is given, limit tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:154
+#: en/rev-list-options.txt:153
#, no-wrap, priority:260
msgid "--remotes[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:159
+#: en/rev-list-options.txt:158
#, priority:260
msgid "Pretend as if all the refs in `refs/remotes` are listed on the command line as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:160
+#: en/rev-list-options.txt:159
#, no-wrap, priority:260
msgid "--glob=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:165
+#: en/rev-list-options.txt:164
#, priority:260
msgid "Pretend as if all the refs matching shell glob '<glob-pattern>' are listed on the command line as '<commit>'. Leading 'refs/', is automatically prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:181
+#: en/rev-list-options.txt:180
#, ignore-same, no-wrap, priority:260
msgid "--reflog"
msgstr "--reflog"
#. type: Plain text
-#: en/rev-list-options.txt:184
+#: en/rev-list-options.txt:183
#, priority:260
msgid "Pretend as if all objects mentioned by reflogs are listed on the command line as `<commit>`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:185
+#: en/rev-list-options.txt:184
#, ignore-same, no-wrap, priority:260
msgid "--alternate-refs"
msgstr "--alternate-refs"
#. type: Plain text
-#: en/rev-list-options.txt:192
+#: en/rev-list-options.txt:191
#, priority:260
msgid "Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in `objects/info/alternates`. The set of included objects may be modified by `core.alternateRefsCommand`, etc. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:200
+#: en/rev-list-options.txt:199
#, priority:260
msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`. This option forces them to examine the current working tree only."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:204
+#: en/rev-list-options.txt:203
#, priority:260
msgid "Upon seeing an invalid object name in the input, pretend as if the bad input was not given."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
+#: en/rev-list-options.txt:205 en/rev-list-options.txt:723
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
#. type: Plain text
-#: en/rev-list-options.txt:211
+#: en/rev-list-options.txt:210
#, priority:260
-msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line. Cannot be combined with --first-parent."
+msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:218
+#: en/rev-list-options.txt:217
#, priority:260
msgid "In addition to the '<commit>' listed on the command line, read them from the standard input. If a `--` separator is seen, stop reading commits and start reading paths to limit the result."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:226
+#: en/rev-list-options.txt:225
#, priority:260
msgid "Don't print anything to standard output. This form is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to `/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:228
+#: en/rev-list-options.txt:227
#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr "--cherry-mark"
#. type: Plain text
-#: en/rev-list-options.txt:231
+#: en/rev-list-options.txt:230
#, priority:260
msgid "Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:232
+#: en/rev-list-options.txt:231
#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr "--cherry-pick"
#. type: Plain text
-#: en/rev-list-options.txt:236
+#: en/rev-list-options.txt:235
#, priority:260
msgid "Omit any commit that introduces the same change as another commit on the ``other side'' when the set of commits are limited with symmetric difference."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:244
+#: en/rev-list-options.txt:243
#, priority:260
msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:245
+#: en/rev-list-options.txt:244
#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
-#: en/rev-list-options.txt:246
+#: en/rev-list-options.txt:245
#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr "--right-only"
#. type: Plain text
-#: en/rev-list-options.txt:250
+#: en/rev-list-options.txt:249
#, priority:260
msgid "List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:256
+#: en/rev-list-options.txt:255
#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:257
+#: en/rev-list-options.txt:256
#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr "--cherry"
#. type: Plain text
-#: en/rev-list-options.txt:263
+#: en/rev-list-options.txt:262
#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:265
+#: en/rev-list-options.txt:264
#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
-#: en/rev-list-options.txt:271
+#: en/rev-list-options.txt:270
#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:278
+#: en/rev-list-options.txt:277
#, priority:260
msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:282
+#: en/rev-list-options.txt:281
#, priority:260
msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:285
+#: en/rev-list-options.txt:284
#, priority:260
msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:288
+#: en/rev-list-options.txt:287
#, priority:260
msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:290
+#: en/rev-list-options.txt:289
#, priority:260
msgid "Otherwise, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:296
+#: en/rev-list-options.txt:295
#, priority:260
msgid "Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:298
+#: en/rev-list-options.txt:297
#, priority:260
msgid "Under `--pretty=reference`, this information will not be shown at all."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:302
+#: en/rev-list-options.txt:301
#, priority:260
msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:303
+#: en/rev-list-options.txt:302
#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr "--boundary"
#. type: Plain text
-#: en/rev-list-options.txt:306
+#: en/rev-list-options.txt:305
#, priority:260
msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:308
+#: en/rev-list-options.txt:307
#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
#. type: Plain text
-#: en/rev-list-options.txt:313
+#: en/rev-list-options.txt:312
#, priority:260
msgid "Try to speed up the traversal using the pack bitmap index (if one is available). Note that when traversing with `--objects`, trees and blobs will not have their associated path printed."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:314
+#: en/rev-list-options.txt:313
#, no-wrap, priority:260
msgid "--progress=<header>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:317
+#: en/rev-list-options.txt:316
#, priority:260
msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:320
+#: en/rev-list-options.txt:319
#, no-wrap, priority:260
msgid "History Simplification"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:326
+#: en/rev-list-options.txt:325
#, priority:260
msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:328
+#: en/rev-list-options.txt:327
#, priority:260
msgid "The following options select the commits to be shown:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:329
+#: en/rev-list-options.txt:328
#, no-wrap, priority:260
msgid "<paths>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:331
+#: en/rev-list-options.txt:330
#, priority:260
msgid "Commits modifying the given <paths> are selected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:332
+#: en/rev-list-options.txt:331
#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
#. type: Plain text
-#: en/rev-list-options.txt:334
+#: en/rev-list-options.txt:333
#, priority:260
msgid "Commits that are referred by some branch or tag are selected."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:336
+#: en/rev-list-options.txt:335
#, priority:260
msgid "Note that extra commits can be shown to give a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:338
+#: en/rev-list-options.txt:337
#, priority:260
msgid "The following options affect the way the simplification is performed:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:339 en/rev-list-options.txt:419
+#: en/rev-list-options.txt:338 en/rev-list-options.txt:418
#, no-wrap, priority:260
msgid "Default mode"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:344
+#: en/rev-list-options.txt:343
#, priority:260
msgid "Simplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
+#: en/rev-list-options.txt:344 en/rev-list-options.txt:674
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
#. type: Plain text
-#: en/rev-list-options.txt:350
+#: en/rev-list-options.txt:349
#, priority:260
msgid "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent. This mode is helpful for showing the merge commits that \"first introduced\" a change to a branch."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:351
+#: en/rev-list-options.txt:350
#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr "--full-history"
#. type: Plain text
-#: en/rev-list-options.txt:353
+#: en/rev-list-options.txt:352
#, priority:260
msgid "Same as the default mode, but does not prune some history."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:354 en/rev-list-options.txt:487
+#: en/rev-list-options.txt:353 en/rev-list-options.txt:486
#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr "--dense"
#. type: Plain text
-#: en/rev-list-options.txt:357
+#: en/rev-list-options.txt:356
#, priority:260
msgid "Only the selected commits are shown, plus some to have a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:360
+#: en/rev-list-options.txt:359
#, priority:260
msgid "All commits in the simplified history are shown."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:361 en/rev-list-options.txt:498
+#: en/rev-list-options.txt:360 en/rev-list-options.txt:497
#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr "--simplify-merges"
#. type: Plain text
-#: en/rev-list-options.txt:365
+#: en/rev-list-options.txt:364
#, priority:260
msgid "Additional option to `--full-history` to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:366 en/rev-list-options.txt:545
+#: en/rev-list-options.txt:365 en/rev-list-options.txt:544
#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr "--ancestry-path"
#. type: Plain text
-#: en/rev-list-options.txt:372
+#: en/rev-list-options.txt:371
#, priority:260
msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:374
+#: en/rev-list-options.txt:373
#, priority:260
msgid "A more detailed explanation follows."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:378
+#: en/rev-list-options.txt:377
#, priority:260
msgid "Suppose you specified `foo` as the <paths>. We shall call commits that modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for `foo`, they look different and equal, respectively.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:382
+#: en/rev-list-options.txt:381
#, priority:260
msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:388
+#: en/rev-list-options.txt:387
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -61545,73 +61799,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:391
+#: en/rev-list-options.txt:390
#, priority:260
msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:395
+#: en/rev-list-options.txt:394
#, priority:260
msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:397
+#: en/rev-list-options.txt:396
#, priority:260
msgid "In `A`, `foo` contains just ``foo''."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:400
+#: en/rev-list-options.txt:399
#, priority:260
msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:403
+#: en/rev-list-options.txt:402
#, priority:260
msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:406
+#: en/rev-list-options.txt:405
#, priority:260
msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:409
+#: en/rev-list-options.txt:408
#, priority:260
msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:413
+#: en/rev-list-options.txt:412
#, priority:260
msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:418
+#: en/rev-list-options.txt:417
#, priority:260
msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:426
+#: en/rev-list-options.txt:425
#, priority:260
msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:428
+#: en/rev-list-options.txt:427
#, priority:260
msgid "This results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:433
+#: en/rev-list-options.txt:432
#, no-wrap, priority:260
msgid ""
"\t .-A---N---O\n"
@@ -61620,67 +61874,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:439
+#: en/rev-list-options.txt:438
#, priority:260
msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely. `C` was considered via `N`, but is TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:443
+#: en/rev-list-options.txt:442
#, priority:260
msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:444
+#: en/rev-list-options.txt:443
#, no-wrap, priority:260
msgid "--full-history without parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:450
+#: en/rev-list-options.txt:449
#, priority:260
msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:453
+#: en/rev-list-options.txt:452
#, no-wrap, priority:260
msgid "\tI A B N D O P Q\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:458
+#: en/rev-list-options.txt:457
#, priority:260
msgid "`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:462
+#: en/rev-list-options.txt:461
#, priority:260
msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:463
+#: en/rev-list-options.txt:462
#, no-wrap, priority:260
msgid "--full-history with parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:466
+#: en/rev-list-options.txt:465
#, priority:260
msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:470
+#: en/rev-list-options.txt:469
#, priority:260
msgid "Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:477
+#: en/rev-list-options.txt:476
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -61691,73 +61945,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:483
+#: en/rev-list-options.txt:482
#, priority:260
msgid "Compare to `--full-history` without rewriting above. Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, `Y` and `Q`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:486
+#: en/rev-list-options.txt:485
#, priority:260
msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:490
+#: en/rev-list-options.txt:489
#, priority:260
msgid "Commits that are walked are included if they are not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:493
+#: en/rev-list-options.txt:492
#, priority:260
msgid "All commits that are walked are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:497
+#: en/rev-list-options.txt:496
#, priority:260
msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:501
+#: en/rev-list-options.txt:500
#, priority:260
msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:504
+#: en/rev-list-options.txt:503
#, priority:260
msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:507
+#: en/rev-list-options.txt:506
#, priority:260
msgid "Set `C'` to `C`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:512
+#: en/rev-list-options.txt:511
#, priority:260
msgid "Replace each parent `P` of `C'` with its simplification `P'`. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:516
+#: en/rev-list-options.txt:515
#, priority:260
msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:520
+#: en/rev-list-options.txt:519
#, priority:260
msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting. The example turns into:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:527
+#: en/rev-list-options.txt:526
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O\n"
@@ -61768,49 +62022,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:530
+#: en/rev-list-options.txt:529
#, priority:260
msgid "Note the major differences in `N`, `P`, and `Q` over `--full-history`:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:534
+#: en/rev-list-options.txt:533
#, priority:260
msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`. Still, `N` remained because it is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:537
+#: en/rev-list-options.txt:536
#, priority:260
msgid "`P`'s parent list similarly had `I` removed. `P` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:541
+#: en/rev-list-options.txt:540
#, priority:260
msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:544
+#: en/rev-list-options.txt:543
#, priority:260
msgid "There is another simplification mode available:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:550
+#: en/rev-list-options.txt:549
#, priority:260
msgid "Limit the displayed commits to those directly on the ancestry chain between the ``from'' and ``to'' commits in the given commit range. I.e. only display commits that are ancestor of the ``to'' commit and descendants of the ``from'' commit."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:552
+#: en/rev-list-options.txt:551
#, priority:260
msgid "As an example use case, consider the following commit history:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:559
+#: en/rev-list-options.txt:558
#, no-wrap, priority:260
msgid ""
"\t D---E-------F\n"
@@ -61821,19 +62075,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:567
+#: en/rev-list-options.txt:566
#, priority:260
msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:573
+#: en/rev-list-options.txt:572
#, priority:260
msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:580
+#: en/rev-list-options.txt:579
#, no-wrap, priority:260
msgid ""
"\t\tE-------F\n"
@@ -61844,19 +62098,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:584
+#: en/rev-list-options.txt:583
#, priority:260
msgid "Before discussing another option, `--show-pulls`, we need to create a new example history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:589
+#: en/rev-list-options.txt:588
#, priority:260
msgid "A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:597
+#: en/rev-list-options.txt:596
#, no-wrap, priority:260
msgid ""
"\t .-A---M-----C--N---O---P\n"
@@ -61868,31 +62122,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:610
+#: en/rev-list-options.txt:609
#, priority:260
msgid "For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by resolving the merge conflict to include both changes from `A` and `B` and hence is not TREESAME to either. The merge commit `R`, however, was created by ignoring the contents of `file.txt` at `M` and taking only the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not `M`. Finally, the natural merge resolution to create `N` is to take the contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:614
+#: en/rev-list-options.txt:613
#, priority:260
msgid "When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:617
+#: en/rev-list-options.txt:616
#, no-wrap, priority:260
msgid "\tI---X\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:622
+#: en/rev-list-options.txt:621
#, priority:260
msgid "When using `--full-history`, Git walks every edge. This will discover the commits `A` and `B` and the merge `M`, but also will reveal the merge commits `O` and `P`. With parent rewriting, the resulting graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:630
+#: en/rev-list-options.txt:629
#, no-wrap, priority:260
msgid ""
"\t .-A---M--------N---O---P\n"
@@ -61904,19 +62158,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:638
+#: en/rev-list-options.txt:637
#, priority:260
msgid "Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the `--full-history` results."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:645
+#: en/rev-list-options.txt:644
#, priority:260
msgid "When using the `--simplify-merges` option, the commits `O` and `P` disappear from the results. This is because the rewritten second parents of `O` and `P` are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit `N`, resulting in a history view as follows:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:653
+#: en/rev-list-options.txt:652
#, no-wrap, priority:260
msgid ""
"\t .-A---M--.\n"
@@ -61928,55 +62182,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:660
+#: en/rev-list-options.txt:659
#, priority:260
msgid "In this view, we see all of the important single-parent changes from `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the not-so-carefully-resolved merge `R`. This is usually enough information to determine why the commits `A` and `B` \"disappeared\" from history in the default view. However, there are a few issues with this approach."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:665
+#: en/rev-list-options.txt:664
#, priority:260
msgid "The first issue is performance. Unlike any previous option, the `--simplify-merges` option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:674
+#: en/rev-list-options.txt:673
#, priority:260
msgid "The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge `R` above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge `N` was used to merge `R` and `X` into the important branch. This commit may have information about why the change `X` came to override the changes from `A` and `B` in its commit message."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:679
+#: en/rev-list-options.txt:678
#, priority:260
msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:684
+#: en/rev-list-options.txt:683
#, priority:260
msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:687
+#: en/rev-list-options.txt:686
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:692
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:696
+#: en/rev-list-options.txt:695
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:704
+#: en/rev-list-options.txt:703
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61988,43 +62242,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:710
+#: en/rev-list-options.txt:709
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:718
+#: en/rev-list-options.txt:717
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:722
+#: en/rev-list-options.txt:721
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:730
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:733
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:737
+#: en/rev-list-options.txt:736
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:741
+#: en/rev-list-options.txt:740
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62032,91 +62286,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:747
+#: en/rev-list-options.txt:746
#, priority:260
-msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
+msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:748
+#: en/rev-list-options.txt:747
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:759
+#: en/rev-list-options.txt:758
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:760
+#: en/rev-list-options.txt:759
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:765
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:770
+#: en/rev-list-options.txt:769
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:774
+#: en/rev-list-options.txt:773
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:778
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:782
+#: en/rev-list-options.txt:781
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:786
+#: en/rev-list-options.txt:785
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:786
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:790
+#: en/rev-list-options.txt:789
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:795
+#: en/rev-list-options.txt:794
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:797
+#: en/rev-list-options.txt:796
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:803
+#: en/rev-list-options.txt:802
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62125,439 +62379,445 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:809
+#: en/rev-list-options.txt:808
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:814
+#: en/rev-list-options.txt:813
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:818
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:825
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:828
+#: en/rev-list-options.txt:827
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:832
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:834
+#: en/rev-list-options.txt:833
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:837
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:838
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:845
+#: en/rev-list-options.txt:844
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:845
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:850
+#: en/rev-list-options.txt:849
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:851
+#: en/rev-list-options.txt:850
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:855
+#: en/rev-list-options.txt:854
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:859
+#: en/rev-list-options.txt:858
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:859
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:863
+#: en/rev-list-options.txt:862
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:863
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:869
+#: en/rev-list-options.txt:868
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:874
+#: en/rev-list-options.txt:873
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:876
+#: en/rev-list-options.txt:875
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:881
+#: en/rev-list-options.txt:880
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:886
+#: en/rev-list-options.txt:885
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:895
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:899
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:903
+#: en/rev-list-options.txt:902
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:912
+#: en/rev-list-options.txt:911
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:915
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:918
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:919
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:923
+#: en/rev-list-options.txt:922
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:930
+#: en/rev-list-options.txt:929
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:933
+#, priority:260
+msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:937
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:941
+#: en/rev-list-options.txt:940
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:948
+#: en/rev-list-options.txt:947
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:950
+#: en/rev-list-options.txt:949
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:957
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:958
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:961
+#: en/rev-list-options.txt:960
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:965
+#: en/rev-list-options.txt:964
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:971
+#: en/rev-list-options.txt:970
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:974
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:977
+#: en/rev-list-options.txt:976
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:978
+#: en/rev-list-options.txt:977
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:985
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:990
+#: en/rev-list-options.txt:989
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:991
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:994
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:997
+#: en/rev-list-options.txt:996
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:998
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:998
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1001
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1005
+#: en/rev-list-options.txt:1004
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1007
+#: en/rev-list-options.txt:1006
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1016
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1023
+#: en/rev-list-options.txt:1022
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1027
+#: en/rev-list-options.txt:1026
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1033
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1037
+#: en/rev-list-options.txt:1036
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1039
+#: en/rev-list-options.txt:1038
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1041
+#: en/rev-list-options.txt:1040
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1042
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1046
+#: en/rev-list-options.txt:1045
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1051
+#: en/rev-list-options.txt:1050
#, 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:1052
+#: en/rev-list-options.txt:1051
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1055
+#: en/rev-list-options.txt:1054
#, 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:1057
+#: en/rev-list-options.txt:1056
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1059
+#: en/rev-list-options.txt:1058
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1061
+#: en/rev-list-options.txt:1060
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1066
+#: en/rev-list-options.txt:1065
#, 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:1068
+#: en/rev-list-options.txt:1067
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1074
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62568,19 +62828,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1077
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1081
+#: en/rev-list-options.txt:1080
#, 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:1088
+#: en/rev-list-options.txt:1087
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62592,89 +62852,47 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1090
+#: en/rev-list-options.txt:1089
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1095
#, 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:1098
+#: en/rev-list-options.txt:1097
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1101
+#: en/rev-list-options.txt:1100
#, 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:1102
+#: en/rev-list-options.txt:1101
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1108
+#: en/rev-list-options.txt:1107
#, 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:1118
+#: en/rev-list-options.txt:1117
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
-#. type: Title ~
-#: en/rev-list-options.txt:1124
-#, no-wrap, priority:260
-msgid "Diff Formatting"
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1129
-#, priority:260
-msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1136
-#, priority:260
-msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1142
-#, priority:260
-msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1157
-#, priority:260
-msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1160
-#, priority:260
-msgid "Show recursive diffs."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1163
-#, priority:260
-msgid "Show the tree objects in the diff output. This implies `-r`."
-msgstr ""
-
#. type: Plain text
#: en/sequencer.txt:5
#, priority:100
@@ -65154,3 +65372,11 @@ msgstr ""
#, priority:100
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.it.po b/po/documentation.it.po
index ae4c300..657ff4f 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-05-24 21:41+0000\n"
"Last-Translator: Ivan Fossati <vania1366@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9891,7 +9877,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17147,16 +17133,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20710,16 +20690,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22543,17 +22517,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22569,18 +22538,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25915,7 +25878,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39809,283 +39772,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49343,16 +49184,10 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49367,28 +49202,16 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49403,20 +49226,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53658,16 +53471,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54498,16 +54305,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54606,16 +54407,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54630,22 +54425,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59582,16 +59365,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59613,33 +59390,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59648,16 +59413,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59666,16 +59425,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59684,16 +59437,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59702,16 +59449,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59811,17 +59552,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -59841,9 +59576,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59865,15 +59600,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59979,9 +59708,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60003,9 +59732,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60027,9 +59756,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60140,16 +59869,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60236,16 +59959,10 @@ msgstr ""
msgid "'%G?'"
msgstr "'%GG'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60290,16 +60007,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60320,16 +60031,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60338,16 +60043,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60369,9 +60068,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60393,9 +60092,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60416,16 +60115,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65726,6 +65419,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index 4f897c2..567fa45 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.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: 2020-07-11 18:07+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-08-15 01:33+0000\n"
"Last-Translator: Yuuki Ebihara <yuuki.ebihara813@gmail.com>\n"
"Language-Team: Japanese\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:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
#, ignore-same, no-wrap, priority:280
msgid "-b"
msgstr "-b"
@@ -31,7 +31,7 @@ msgid "Show blank SHA-1 for boundary commits. This can also be controlled via t
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:560
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:582
#, ignore-same, no-wrap, priority:100
msgid "--root"
msgstr "--root"
@@ -91,8 +91,8 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
-#, ignore-same, no-wrap, priority:260
+#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
+#, ignore-same, no-wrap, priority:280
msgid "-t"
msgstr "-t"
@@ -127,163 +127,175 @@ msgid "Walk history forward instead of backward. Instead of showing the revision
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:98 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:522 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#, ignore-same, no-wrap, priority:260
+msgid "--first-parent"
+msgstr "--first-parent"
+
+#. type: Plain text
+#: en/blame-options.txt:44
+#, priority:100
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall."
+msgstr ""
+
+#. type: Labeled list
+#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, ignore-same, no-wrap, priority:300
msgid "-p"
msgstr "-p"
#. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
+#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:216
#, ignore-same, no-wrap, priority:280
msgid "--porcelain"
msgstr "--porcelain"
#. type: Plain text
-#: en/blame-options.txt:42
+#: en/blame-options.txt:48
#, priority:100
msgid "Show in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:43
+#: en/blame-options.txt:49
#, ignore-same, no-wrap, priority:100
msgid "--line-porcelain"
msgstr "--line-porcelain"
#. type: Plain text
-#: en/blame-options.txt:47
+#: en/blame-options.txt:53
#, priority:100
msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
+#: en/blame-options.txt:54 en/git-pack-objects.txt:138 en/git-svn.txt:373
#, ignore-same, no-wrap, priority:100
msgid "--incremental"
msgstr "--incremental"
#. type: Plain text
-#: en/blame-options.txt:51
+#: en/blame-options.txt:57
#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:52 en/git-mailinfo.txt:62 en/pretty-options.txt:35
+#: en/blame-options.txt:58 en/git-mailinfo.txt:62 en/pretty-options.txt:35
#, no-wrap, priority:260
msgid "--encoding=<encoding>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:58
+#: en/blame-options.txt:64
#, priority:100
msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:59
+#: en/blame-options.txt:65
#, no-wrap, priority:100
msgid "--contents <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:65
+#: en/blame-options.txt:71
#, priority:100
msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:66
+#: en/blame-options.txt:72
#, no-wrap, priority:100
msgid "--date <format>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:72
+#: en/blame-options.txt:78
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:73 en/git-fsck.txt:100
+#: en/blame-options.txt:79 en/git-fsck.txt:100
#, ignore-same, no-wrap, priority:100
msgid "--[no-]progress"
msgstr "--[no-]progress"
#. type: Plain text
-#: en/blame-options.txt:79
+#: en/blame-options.txt:85
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:80
+#: en/blame-options.txt:86
#, no-wrap, priority:100
msgid "-M[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:90
+#: en/blame-options.txt:96
#, priority:100
msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:95
+#: en/blame-options.txt:101
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:96
+#: en/blame-options.txt:102
#, no-wrap, priority:100
msgid "-C[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:105
+#: en/blame-options.txt:111
#, priority:100
msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:112
+#: en/blame-options.txt:118
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:113
+#: en/blame-options.txt:119
#, no-wrap, priority:100
msgid "--ignore-rev <rev>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:124
+#: en/blame-options.txt:130
#, priority:100
msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:125
+#: en/blame-options.txt:131
#, no-wrap, priority:100
msgid "--ignore-revs-file <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:131
+#: en/blame-options.txt:137
#, priority:100
msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
+#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, ignore-same, no-wrap, priority:100
msgid "-h"
msgstr "-h"
#. type: Plain text
-#: en/blame-options.txt:133
+#: en/blame-options.txt:139
#, priority:100
msgid "Show help message."
msgstr ""
@@ -972,254 +984,266 @@ msgstr "linkgit:git-log[1]"
msgid "Show commit logs."
msgstr ""
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:64
+#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-maintenance[1]"
+msgstr "linkgit:git-maintenance[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:66
+#, priority:100
+msgid "Run tasks to optimize Git repository data."
+msgstr ""
+
#. type: Plain text
-#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
+#: en/cmds-mainporcelain.txt:67 en/git-fmt-merge-msg.txt:75
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:66
+#: en/cmds-mainporcelain.txt:69
#, priority:100
msgid "Join two or more development histories together."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:67
+#: en/cmds-mainporcelain.txt:70
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:69
+#: en/cmds-mainporcelain.txt:72
#, priority:100
msgid "Move or rename a file, a directory, or a symlink."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:70
+#: en/cmds-mainporcelain.txt:73
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:72
+#: en/cmds-mainporcelain.txt:75
#, priority:100
msgid "Add or inspect object notes."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
+#: en/cmds-mainporcelain.txt:76 en/git-fetch.txt:300
#, ignore-same, no-wrap, priority:220
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:75
+#: en/cmds-mainporcelain.txt:78
#, priority:100
msgid "Fetch from and integrate with another repository or a local branch."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:76
+#: en/cmds-mainporcelain.txt:79
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:78
+#: en/cmds-mainporcelain.txt:81
#, priority:100
msgid "Update remote refs along with associated objects."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:79
+#: en/cmds-mainporcelain.txt:82
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:81
+#: en/cmds-mainporcelain.txt:84
#, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1172
+#: en/cmds-mainporcelain.txt:85 en/git-svn.txt:1172
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:84
+#: en/cmds-mainporcelain.txt:87
#, priority:100
msgid "Reapply commits on top of another base tip."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:85
+#: en/cmds-mainporcelain.txt:88
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:87
+#: en/cmds-mainporcelain.txt:90
#, priority:100
msgid "Reset current HEAD to the specified state."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:88
+#: en/cmds-mainporcelain.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-restore[1]"
msgstr "linkgit:git-restore[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:90
+#: en/cmds-mainporcelain.txt:93
#, priority:100
msgid "Restore working tree files."
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:243
+#: en/cmds-mainporcelain.txt:94 en/git-cherry-pick.txt:243
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:93
+#: en/cmds-mainporcelain.txt:96
#, priority:100
msgid "Revert some existing commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:94
+#: en/cmds-mainporcelain.txt:97
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:96
+#: en/cmds-mainporcelain.txt:99
#, priority:100
msgid "Remove files from the working tree and from the index."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:97
+#: en/cmds-mainporcelain.txt:100
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:99
+#: en/cmds-mainporcelain.txt:102
#, priority:100
msgid "Summarize 'git log' output."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:100
+#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:102
+#: en/cmds-mainporcelain.txt:105
#, priority:100
msgid "Show various types of objects."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:103
+#: en/cmds-mainporcelain.txt:106
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-sparse-checkout[1]"
msgstr "linkgit:git-sparse-checkout[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Initialize and modify the sparse-checkout."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121
+#: en/cmds-mainporcelain.txt:124
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:127 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:126
+#: en/cmds-mainporcelain.txt:129
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -1417,7 +1441,7 @@ msgid "Show packed archive index."
msgstr ""
#. type: Plain text
-#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
+#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:417
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -2041,7 +2065,7 @@ msgid "Update auxiliary info file to help dumb servers."
msgstr ""
#. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:239
+#: en/config.txt:2 en/git-worktree.txt:274
#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
msgstr ""
@@ -2413,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2433,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -2464,7 +2474,7 @@ msgid "The value for many variables that specify various sizes can be suffixed w
msgstr ""
#. type: Labeled list
-#: en/config.txt:260 en/diff-options.txt:356 en/git-for-each-ref.txt:177
+#: en/config.txt:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175
#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"
@@ -2518,7 +2528,7 @@ msgid "A variable that takes a pathname value can be given a string that begins
msgstr ""
#. type: Title ~
-#: en/config.txt:304 en/git-imap-send.txt:58
+#: en/config.txt:304
#, no-wrap, priority:100
msgid "Variables"
msgstr ""
@@ -2746,11 +2756,29 @@ msgid "merge.log"
msgstr "merge.log"
#. type: Plain text
-#: en/config/fmt-merge-msg.txt:10
+#: en/config/fmt-merge-msg.txt:11
#, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
msgstr ""
+#. type: Labeled list
+#: en/config/fmt-merge-msg.txt:12
+#, ignore-same, no-wrap, priority:240
+msgid "merge.suppressDest"
+msgstr "merge.suppressDest"
+
+#. type: Plain text
+#: en/config/fmt-merge-msg.txt:18
+#, priority:240
+msgid "By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit \"into <branch name>\" from its title."
+msgstr ""
+
+#. type: Plain text
+#: en/config/fmt-merge-msg.txt:22
+#, priority:240
+msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries. When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility."
+msgstr ""
+
#. type: Title -
#: en/date-formats.txt:2
#, no-wrap, priority:280
@@ -3284,49 +3312,49 @@ msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:14
+#: en/diff-generate-patch.txt:15
#, priority:260
-msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:17
+#: en/diff-generate-patch.txt:18
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:19
+#: en/diff-generate-patch.txt:20
#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:21
+#: en/diff-generate-patch.txt:22
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:25
+#: en/diff-generate-patch.txt:26
#, priority:260
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:29
+#: en/diff-generate-patch.txt:30
#, priority:260
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:31
+#: en/diff-generate-patch.txt:32
#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:43
+#: en/diff-generate-patch.txt:44
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
@@ -3343,43 +3371,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:46
+#: en/diff-generate-patch.txt:47
#, priority:260
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:48
+#: en/diff-generate-patch.txt:49
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:55
+#: en/diff-generate-patch.txt:56
#, priority:260
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:59
+#: en/diff-generate-patch.txt:60
#, priority:260
msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:63
+#: en/diff-generate-patch.txt:64
#, priority:260
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:68
+#: en/diff-generate-patch.txt:69
#, priority:260
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:75
+#: en/diff-generate-patch.txt:76
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
@@ -3391,25 +3419,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/diff-generate-patch.txt:78
+#: en/diff-generate-patch.txt:79
#, no-wrap, priority:260
msgid "Combined diff format"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:86
+#: en/diff-generate-patch.txt:87
#, priority:260
msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:88
+#: en/diff-generate-patch.txt:89
#, priority:260
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:97
+#: en/diff-generate-patch.txt:98
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
@@ -3422,7 +3450,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:107
+#: en/diff-generate-patch.txt:108
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
@@ -3437,7 +3465,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/diff-generate-patch.txt:117
+#: en/diff-generate-patch.txt:118
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
@@ -3452,37 +3480,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:121
+#: en/diff-generate-patch.txt:122
#, priority:260
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:123
+#: en/diff-generate-patch.txt:124
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:125
+#: en/diff-generate-patch.txt:126
#, priority:260
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:127
+#: en/diff-generate-patch.txt:128
#, no-wrap, priority:260
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:130
+#: en/diff-generate-patch.txt:131
#, priority:260
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:135
+#: en/diff-generate-patch.txt:136
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
@@ -3492,91 +3520,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:141
+#: en/diff-generate-patch.txt:142
#, priority:260
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:143
+#: en/diff-generate-patch.txt:144
#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:145 en/diff-generate-patch.txt:156 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
#, priority:260
msgid "a/file"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
+#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
#, priority:260
msgid "b/file"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:150
+#: en/diff-generate-patch.txt:151
#, priority:260
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:154
+#: en/diff-generate-patch.txt:155
#, priority:260
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:163
+#: en/diff-generate-patch.txt:164
#, priority:260
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:169
+#: en/diff-generate-patch.txt:170
#, priority:260
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:171
+#: en/diff-generate-patch.txt:172
#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:174
+#: en/diff-generate-patch.txt:175
#, priority:260
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:183
+#: en/diff-generate-patch.txt:184
#, ignore-ellipsis, priority:260
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:189
+#: en/diff-generate-patch.txt:190
#, priority:260
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:195
+#: en/diff-generate-patch.txt:196
#, priority:260
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:201
+#: en/diff-generate-patch.txt:202
#, priority:260
msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:409 en/merge-options.txt:93
+#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:93
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"
@@ -3588,13 +3616,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:209 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"
@@ -3724,356 +3752,362 @@ msgstr "--patch-with-raw"
msgid "Synonym for `-p --raw`."
msgstr ""
+#. type: Plain text
+#: en/diff-options.txt:79
+#, priority:280
+msgid "Show the tree objects in the diff output."
+msgstr ""
+
#. type: Labeled list
-#: en/diff-options.txt:76
+#: en/diff-options.txt:81
#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
#. type: Plain text
-#: en/diff-options.txt:79
+#: en/diff-options.txt:84
#, priority:280
msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:80
+#: en/diff-options.txt:85
#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
#. type: Plain text
-#: en/diff-options.txt:82
+#: en/diff-options.txt:87
#, priority:280
msgid "Disable the indent heuristic."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:83
+#: en/diff-options.txt:88
#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"
#. type: Plain text
-#: en/diff-options.txt:86 en/diff-options.txt:112
+#: en/diff-options.txt:91 en/diff-options.txt:117
#, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:87
+#: en/diff-options.txt:92
#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"
#. type: Plain text
-#: en/diff-options.txt:89
+#: en/diff-options.txt:94
#, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:90
+#: en/diff-options.txt:95
#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"
#. type: Plain text
-#: en/diff-options.txt:92
+#: en/diff-options.txt:97
#, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:93
+#: en/diff-options.txt:98
#, no-wrap, priority:280
msgid "--anchored=<text>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:95
+#: en/diff-options.txt:100
#, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:97
+#: en/diff-options.txt:102
#, priority:280
msgid "This option may be specified more than once."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:102
+#: en/diff-options.txt:107
#, priority:280
msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:103
+#: en/diff-options.txt:108
#, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:105
+#: en/diff-options.txt:110
#, priority:280
msgid "Choose a diff algorithm. The variants are as follows:"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:107
+#: en/diff-options.txt:112
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"
#. type: Plain text
-#: en/diff-options.txt:109
+#: en/diff-options.txt:114
#, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:109
+#: en/diff-options.txt:114
#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
-#: en/diff-options.txt:112
+#: en/diff-options.txt:117
#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"
#. type: Plain text
-#: en/diff-options.txt:114
+#: en/diff-options.txt:119
#, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:114
+#: en/diff-options.txt:119
#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"
#. type: Plain text
-#: en/diff-options.txt:117
+#: en/diff-options.txt:122
#, priority:280
msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:122
+#: en/diff-options.txt:127
#, priority:280
msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:123
+#: en/diff-options.txt:128
#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:137
+#: en/diff-options.txt:142
#, ignore-ellipsis, priority:280
msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:140
+#: en/diff-options.txt:145
#, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:141
+#: en/diff-options.txt:146
#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"
#. type: Plain text
-#: en/diff-options.txt:148
+#: en/diff-options.txt:153
#, priority:280
msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:149 en/git-apply.txt:45
+#: en/diff-options.txt:154 en/git-apply.txt:45
#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr "--numstat"
#. type: Plain text
-#: en/diff-options.txt:155
+#: en/diff-options.txt:160
#, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:156
+#: en/diff-options.txt:161
#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"
#. type: Plain text
-#: en/diff-options.txt:160
+#: en/diff-options.txt:165
#, priority:280
msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:161
+#: en/diff-options.txt:166
#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:162
+#: en/diff-options.txt:167
#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:169
+#: en/diff-options.txt:174
#, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:171
+#: en/diff-options.txt:176
#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
-#: en/diff-options.txt:177
+#: en/diff-options.txt:182
#, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:177
+#: en/diff-options.txt:182
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"
#. type: Plain text
-#: en/diff-options.txt:185
+#: en/diff-options.txt:190
#, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:185
+#: en/diff-options.txt:190
#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"
#. type: Plain text
-#: en/diff-options.txt:190
+#: en/diff-options.txt:195
#, priority:280
msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:190
+#: en/diff-options.txt:195
#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"
#. type: Plain text
-#: en/diff-options.txt:195
+#: en/diff-options.txt:200
#, priority:280
msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:195 en/git-cherry.txt:39
+#: en/diff-options.txt:200 en/git-cherry.txt:39
#, no-wrap, priority:280
msgid "<limit>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:199
+#: en/diff-options.txt:204
#, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:205
+#: en/diff-options.txt:210
#, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:206
+#: en/diff-options.txt:211
#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr "--cumulative"
#. type: Plain text
-#: en/diff-options.txt:208
+#: en/diff-options.txt:213
#, priority:280
msgid "Synonym for --dirstat=cumulative"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:209
+#: en/diff-options.txt:214
#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:211
+#: en/diff-options.txt:216
#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
+#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"
#. type: Plain text
-#: en/diff-options.txt:215
+#: en/diff-options.txt:220
#, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:217
+#: en/diff-options.txt:222
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
#. type: Plain text
-#: en/diff-options.txt:219
+#: en/diff-options.txt:224
#, priority:280
msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 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:174
+#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 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:174
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"
#. type: Plain text
-#: en/diff-options.txt:226
+#: en/diff-options.txt:231
#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:229
+#: en/diff-options.txt:234
#, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:233
+#: en/diff-options.txt:238
#, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
@@ -4081,61 +4115,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:238 en/git-apply.txt:122
+#: en/diff-options.txt:243 en/git-apply.txt:122
#, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"
#. type: Plain text
-#: en/diff-options.txt:241
+#: en/diff-options.txt:246
#, priority:280
msgid "Show only names of changed files."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:242 en/git-ls-tree.txt:60
+#: en/diff-options.txt:247 en/git-ls-tree.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"
#. type: Plain text
-#: en/diff-options.txt:245
+#: en/diff-options.txt:250
#, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:246
+#: en/diff-options.txt:251
#, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:257
+#: en/diff-options.txt:262
#, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:262
+#: en/diff-options.txt:267
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:265
+#: en/diff-options.txt:270
#, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
@@ -4143,49 +4177,49 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
+#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"
#. type: Plain text
-#: en/diff-options.txt:269
+#: en/diff-options.txt:274
#, priority:280
msgid "Turn off colored diff."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:271
+#: en/diff-options.txt:276
#, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:273
+#: en/diff-options.txt:278
#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:274
+#: en/diff-options.txt:279
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:276
+#: en/diff-options.txt:281
#, priority:280
msgid "Moved lines of code are colored differently."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:278
+#: en/diff-options.txt:283
#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:282
+#: en/diff-options.txt:287
#, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
@@ -4194,409 +4228,409 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:284 en/diff-options.txt:326
+#: en/diff-options.txt:289 en/diff-options.txt:331
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
#. type: Plain text
-#: en/diff-options.txt:286
+#: en/diff-options.txt:291
#, priority:280
msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:286 en/git-commit.txt:212
+#: en/diff-options.txt:291 en/git-commit.txt:212
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
#. type: Plain text
-#: en/diff-options.txt:289
+#: en/diff-options.txt:294
#, priority:280
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:289 en/diff-options.txt:358
+#: en/diff-options.txt:294 en/diff-options.txt:363
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
#. type: Plain text
-#: en/diff-options.txt:296
+#: en/diff-options.txt:301
#, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:296
+#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
#. type: Plain text
-#: en/diff-options.txt:301
+#: en/diff-options.txt:306
#, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:301
+#: en/diff-options.txt:306
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
#. type: Plain text
-#: en/diff-options.txt:306
+#: en/diff-options.txt:311
#, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:306
+#: en/diff-options.txt:311
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
#. type: Plain text
-#: en/diff-options.txt:311
+#: en/diff-options.txt:316
#, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:313
+#: en/diff-options.txt:318
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"
#. type: Plain text
-#: en/diff-options.txt:316
+#: en/diff-options.txt:321
#, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:317
+#: en/diff-options.txt:322
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:320
+#: en/diff-options.txt:325
#, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:322
+#: en/diff-options.txt:327
#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:324
+#: en/diff-options.txt:329
#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:328
+#: en/diff-options.txt:333
#, priority:280
msgid "Do not ignore whitespace when performing move detection."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:328 en/merge-strategies.txt:61
+#: en/diff-options.txt:333 en/merge-strategies.txt:61
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:668
+#: en/diff-options.txt:335 en/diff-options.txt:674
#, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:330 en/merge-strategies.txt:59
+#: en/diff-options.txt:335 en/merge-strategies.txt:59
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:674
+#: en/diff-options.txt:339 en/diff-options.txt:680
#, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:334 en/merge-strategies.txt:60
+#: en/diff-options.txt:339 en/merge-strategies.txt:60
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:337
+#: en/diff-options.txt:342
#, 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:337
+#: en/diff-options.txt:342
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
#. type: Plain text
-#: en/diff-options.txt:342
+#: en/diff-options.txt:347
#, priority:280
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:344
+#: en/diff-options.txt:349
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
#. type: Plain text
-#: en/diff-options.txt:348
+#: en/diff-options.txt:353
#, priority:280
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:349
+#: en/diff-options.txt:354
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:354
+#: en/diff-options.txt:359
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:358
+#: en/diff-options.txt:363
#, priority:280
msgid "Highlight changed words using only colors. Implies `--color`."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:362
+#: en/diff-options.txt:367
#, priority:280
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:362
+#: en/diff-options.txt:367
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
#. type: Plain text
-#: en/diff-options.txt:369
+#: en/diff-options.txt:374
#, priority:280
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
+#: en/diff-options.txt:374 en/git-daemon.txt:131 en/git-submodule.txt:172
#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
#. type: Plain text
-#: en/diff-options.txt:371
+#: en/diff-options.txt:376
#, priority:280
msgid "Disable word diff again."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:375
+#: en/diff-options.txt:380
#, priority:280
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:376
+#: en/diff-options.txt:381
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:380
+#: en/diff-options.txt:385
#, priority:280
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:388
+#: en/diff-options.txt:393
#, priority:280
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:391
+#: en/diff-options.txt:396
#, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:396
+#: en/diff-options.txt:401
#, priority:280
msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:397
+#: en/diff-options.txt:402
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:400
+#: en/diff-options.txt:405
#, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:402 en/git-status.txt:143
+#: en/diff-options.txt:407 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
msgstr "--no-renames"
#. type: Plain text
-#: en/diff-options.txt:405
+#: en/diff-options.txt:410
#, priority:280
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:406
+#: en/diff-options.txt:411
#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
msgstr "--[no-]rename-empty"
#. type: Plain text
-#: en/diff-options.txt:408
+#: en/diff-options.txt:413
#, priority:280
msgid "Whether to use empty blobs as rename source."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:410 en/git-apply.txt:58
+#: en/diff-options.txt:415 en/git-apply.txt:58
#, ignore-same, no-wrap, priority:280
msgid "--check"
msgstr "--check"
#. type: Plain text
-#: en/diff-options.txt:419
+#: en/diff-options.txt:424
#, priority:280
msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:420
+#: en/diff-options.txt:425
#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:429
+#: en/diff-options.txt:434
#, priority:280
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:432
+#: en/diff-options.txt:437
#, ignore-same, no-wrap, priority:280
msgid "--full-index"
msgstr "--full-index"
#. type: Plain text
-#: en/diff-options.txt:436
+#: en/diff-options.txt:441
#, priority:280
msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:437 en/git-apply.txt:160
+#: en/diff-options.txt:442 en/git-apply.txt:160
#, ignore-same, no-wrap, priority:280
msgid "--binary"
msgstr "--binary"
#. type: Plain text
-#: en/diff-options.txt:440
+#: en/diff-options.txt:445
#, priority:280
msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
+#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:448
+#: en/diff-options.txt:454
#, priority:280
-msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
+msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:449
+#: en/diff-options.txt:455
#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:450
+#: en/diff-options.txt:456
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:453
+#: en/diff-options.txt:459
#, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:463
+#: en/diff-options.txt:469
#, priority:280
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:471
+#: en/diff-options.txt:477
#, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:472
+#: en/diff-options.txt:478
#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:473 en/git-status.txt:147
+#: en/diff-options.txt:479 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:476
+#: en/diff-options.txt:482
#, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:481
+#: en/diff-options.txt:487
#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
@@ -4605,7 +4639,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:491
+#: en/diff-options.txt:497
#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
@@ -4620,139 +4654,139 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:492
+#: en/diff-options.txt:498
#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:493
+#: en/diff-options.txt:499
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:496
+#: en/diff-options.txt:502
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:497 en/git-svn.txt:626
+#: en/diff-options.txt:503 en/git-svn.txt:626
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
-#: en/diff-options.txt:505
+#: en/diff-options.txt:511
#, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
+#: en/diff-options.txt:512 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:507
+#: en/diff-options.txt:513
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
#. type: Plain text
-#: en/diff-options.txt:515
+#: en/diff-options.txt:521
#, priority:280
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:518
+#: en/diff-options.txt:524
#, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:519 en/git-svn.txt:625
+#: en/diff-options.txt:525 en/git-svn.txt:625
#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:525
+#: en/diff-options.txt:531
#, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:527
+#: en/diff-options.txt:533
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:538
+#: en/diff-options.txt:544
#, 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:541
+#: en/diff-options.txt:547
#, 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:547
+#: en/diff-options.txt:553
#, 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:548
+#: en/diff-options.txt:554
#, no-wrap, priority:280
msgid "-S<string>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:552
+#: en/diff-options.txt:558
#, 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:558
+#: en/diff-options.txt:564
#, 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:560
+#: en/diff-options.txt:566
#, priority:280
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:561
+#: en/diff-options.txt:567
#, no-wrap, priority:280
msgid "-G<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:564
+#: en/diff-options.txt:570
#, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:568
+#: en/diff-options.txt:574
#, 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:573
+#: en/diff-options.txt:579
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -4761,391 +4795,391 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:578
+#: en/diff-options.txt:584
#, 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:581
+#: en/diff-options.txt:587
#, 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:584
+#: en/diff-options.txt:590
#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:585
+#: en/diff-options.txt:591
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:590
+#: en/diff-options.txt:596
#, 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:593
+#: en/diff-options.txt:599
#, 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:594
+#: en/diff-options.txt:600
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
#. type: Plain text
-#: en/diff-options.txt:598
+#: en/diff-options.txt:604
#, 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:599
+#: en/diff-options.txt:605
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
#. type: Plain text
-#: en/diff-options.txt:602
+#: en/diff-options.txt:608
#, 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:605 en/git-mergetool.txt:95
+#: en/diff-options.txt:611 en/git-mergetool.txt:95
#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:610
+#: en/diff-options.txt:616
#, 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:622
+#: en/diff-options.txt:628
#, 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:624
+#: en/diff-options.txt:630
#, priority:280
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:628
+#: en/diff-options.txt:634
#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:632
+#: en/diff-options.txt:638
#, 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:634
+#: en/diff-options.txt:640
#, priority:280
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:641
+#: en/diff-options.txt:647
#, 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:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
+#: en/diff-options.txt:649 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:646
+#: en/diff-options.txt:652
#, 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:648
+#: en/diff-options.txt:654
#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:649
+#: en/diff-options.txt:655
#, ignore-same, no-wrap, priority:280
msgid "--no-relative"
msgstr "--no-relative"
#. type: Plain text
-#: en/diff-options.txt:658
+#: en/diff-options.txt:664
#, 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:659 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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:665 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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
#, ignore-same, no-wrap, priority:280
msgid "-a"
msgstr "-a"
#. type: Labeled list
-#: en/diff-options.txt:660 en/git-grep.txt:103
+#: en/diff-options.txt:666 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
msgstr "--text"
#. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:668
#, priority:280
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:669
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
-#: en/diff-options.txt:665
+#: en/diff-options.txt:671
#, priority:280
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:666
+#: en/diff-options.txt:672
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
-#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:676 en/git-am.txt:107 en/git-apply.txt:182
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
-#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 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:676
+#: en/diff-options.txt:682
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:686
#, 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:681
+#: en/diff-options.txt:687
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#. type: Plain text
-#: en/diff-options.txt:683
+#: en/diff-options.txt:689
#, priority:280
msgid "Ignore changes whose lines are all blank."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:684
+#: en/diff-options.txt:690
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:689
+#: en/diff-options.txt:695
#, 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:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:691 en/git-grep.txt:265
+#: en/diff-options.txt:697 en/git-grep.txt:265
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
msgstr "--function-context"
#. type: Plain text
-#: en/diff-options.txt:693
+#: en/diff-options.txt:699
#, priority:280
msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:696 en/git-ls-remote.txt:48
+#: en/diff-options.txt:702 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:700
+#: en/diff-options.txt:706
#, 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:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:707 en/fetch-options.txt:238 en/git-am.txt:74 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:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222 en/merge-options.txt:147 en/rev-list-options.txt:219
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
msgstr "--quiet"
#. type: Plain text
-#: en/diff-options.txt:703
+#: en/diff-options.txt:709
#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:706
+#: en/diff-options.txt:712
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
msgstr "--ext-diff"
#. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:716
#, 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:711
+#: en/diff-options.txt:717
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#. type: Plain text
-#: en/diff-options.txt:713
+#: en/diff-options.txt:719
#, priority:280
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:720 en/git-cat-file.txt:60 en/git-grep.txt:106
#, ignore-same, no-wrap, priority:280
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
-#: en/diff-options.txt:715 en/git-grep.txt:109
+#: en/diff-options.txt:721 en/git-grep.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-textconv"
msgstr "--no-textconv"
#. type: Plain text
-#: en/diff-options.txt:724
+#: en/diff-options.txt:730
#, 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:725 en/git-status.txt:87
+#: en/diff-options.txt:731 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:743
#, 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:738
+#: en/diff-options.txt:744
#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:746
#, priority:280
msgid "Show the given source prefix instead of \"a/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:747
#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:749
#, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:750
#, ignore-same, no-wrap, priority:280
msgid "--no-prefix"
msgstr "--no-prefix"
#. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:752
#, priority:280
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:753
#, no-wrap, priority:280
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:749
+#: en/diff-options.txt:755
#, priority:280
msgid "Prepend an additional prefix to every line of output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:750
+#: en/diff-options.txt:756
#, ignore-same, no-wrap, priority:280
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
-#: en/diff-options.txt:757
+#: en/diff-options.txt:763
#, 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:759
+#: en/diff-options.txt:765
#, 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:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
+#: 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:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
#, ignore-same, no-wrap, priority:300
msgid "--all"
msgstr "--all"
@@ -5277,7 +5311,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 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:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 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:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:212
#, ignore-same, no-wrap, priority:300
msgid "--dry-run"
msgstr "--dry-run"
@@ -5289,25 +5323,37 @@ msgid "Show what would be done, without making any changes."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:67 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:429 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
+#: en/fetch-options.txt:68
+#, ignore-same, no-wrap, priority:220
+msgid "--[no-]write-fetch-head"
+msgstr "--[no-]write-fetch-head"
+
+#. type: Plain text
+#: en/fetch-options.txt:74
+#, 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:76 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:153
#, ignore-same, no-wrap, priority:300
msgid "-f"
msgstr "-f"
#. type: Labeled list
-#: en/fetch-options.txt:68 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:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:120
+#: en/fetch-options.txt:77 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:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--force"
msgstr "--force"
#. type: Plain text
-#: en/fetch-options.txt:71
+#: en/fetch-options.txt:80
#, 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:74
+#: en/fetch-options.txt:83
#, no-wrap, priority:220
msgid ""
"\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
@@ -5315,379 +5361,385 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:77
+#: en/fetch-options.txt:86
#, no-wrap, priority:220
msgid "\tin the `<refspec>` part below.\n"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:79
+#: en/fetch-options.txt:88
#, no-wrap, priority:220
msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:80 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
+#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, ignore-same, no-wrap, priority:280
msgid "-k"
msgstr "-k"
#. type: Labeled list
-#: en/fetch-options.txt:81 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
+#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
#, ignore-same, no-wrap, priority:280
msgid "--keep"
msgstr "--keep"
#. type: Plain text
-#: en/fetch-options.txt:83
+#: en/fetch-options.txt:92
#, priority:220
msgid "Keep downloaded pack."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:85
+#: en/fetch-options.txt:94
#, ignore-same, no-wrap, priority:220
msgid "--multiple"
msgstr "--multiple"
#. type: Plain text
-#: en/fetch-options.txt:88
+#: en/fetch-options.txt:97
#, 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:89
+#: en/fetch-options.txt:98
+#, ignore-same, no-wrap, priority:220
+msgid "--[no-]auto-maintenance"
+msgstr "--[no-]auto-maintenance"
+
+#. type: Labeled list
+#: en/fetch-options.txt:99
#, ignore-same, no-wrap, priority:220
msgid "--[no-]auto-gc"
msgstr "--[no-]auto-gc"
#. type: Plain text
-#: en/fetch-options.txt:92
+#: en/fetch-options.txt:103
#, priority:220
-msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
+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:93
+#: en/fetch-options.txt:104
#, ignore-same, no-wrap, priority:220
msgid "--[no-]write-commit-graph"
msgstr "--[no-]write-commit-graph"
#. type: Plain text
-#: en/fetch-options.txt:96
+#: en/fetch-options.txt:107
#, priority:220
msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:99 en/git-push.txt:153
+#: en/fetch-options.txt:110 en/git-push.txt:153
#, ignore-same, no-wrap, priority:220
msgid "--prune"
msgstr "--prune"
#. type: Plain text
-#: en/fetch-options.txt:109
+#: en/fetch-options.txt:120
#, 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:112 en/fetch-options.txt:123
+#: en/fetch-options.txt:123 en/fetch-options.txt:134
#, priority:220
msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap, priority:260
msgid "-P"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:114
+#: en/fetch-options.txt:125
#, ignore-same, no-wrap, priority:220
msgid "--prune-tags"
msgstr "--prune-tags"
#. type: Plain text
-#: en/fetch-options.txt:121
+#: en/fetch-options.txt:132
#, 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:127 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 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:176 en/merge-options.txt:92
+#: en/fetch-options.txt:138 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 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:211 en/merge-options.txt:92
#, ignore-same, no-wrap, priority:300
msgid "-n"
msgstr "-n"
#. type: Labeled list
-#: en/fetch-options.txt:129 en/git-clone.txt:250
+#: en/fetch-options.txt:140 en/git-clone.txt:250
#, ignore-same, no-wrap, priority:300
msgid "--no-tags"
msgstr "--no-tags"
#. type: Plain text
-#: en/fetch-options.txt:135
+#: en/fetch-options.txt:146
#, 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:136
+#: en/fetch-options.txt:147
#, no-wrap, priority:220
msgid "--refmap=<refspec>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:146
+#: en/fetch-options.txt:157
#, 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:148 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:159 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:155
+#: en/fetch-options.txt:166
#, 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:157
+#: en/fetch-options.txt:168
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:168
+#: en/fetch-options.txt:179
#, 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:170
+#: en/fetch-options.txt:181
#, ignore-same, no-wrap, priority:220
msgid "-j"
msgstr "-j"
#. type: Labeled list
-#: en/fetch-options.txt:171
+#: en/fetch-options.txt:182
#, no-wrap, priority:220
msgid "--jobs=<n>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:173
+#: en/fetch-options.txt:184
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:178
+#: en/fetch-options.txt:189
#, 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:181
+#: en/fetch-options.txt:192
#, 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:183 en/git-checkout.txt:294 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
+#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
#, ignore-same, no-wrap, priority:240
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
#. type: Plain text
-#: en/fetch-options.txt:186
+#: en/fetch-options.txt:197
#, 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:188 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:199 en/git-branch.txt:225 en/git-push.txt:349
#, ignore-same, no-wrap, priority:240
msgid "--set-upstream"
msgstr "--set-upstream"
#. type: Plain text
-#: en/fetch-options.txt:194
+#: en/fetch-options.txt:205
#, priority:220
-msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
+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:196
+#: en/fetch-options.txt:207
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:200
+#: en/fetch-options.txt:211
#, 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:201
+#: en/fetch-options.txt:212
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:208
+#: en/fetch-options.txt:219
#, 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:210
+#: en/fetch-options.txt:221
#, ignore-same, no-wrap, priority:220
msgid "--update-head-ok"
msgstr "--update-head-ok"
#. type: Plain text
-#: en/fetch-options.txt:217
+#: en/fetch-options.txt:228
#, 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:219 en/git-clone.txt:199
+#: en/fetch-options.txt:230 en/git-clone.txt:199
#, fuzzy, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
msgstr "--upload-pack <upload-pack>"
#. type: Plain text
-#: en/fetch-options.txt:224
+#: en/fetch-options.txt:235
#, 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:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 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:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
+#: en/fetch-options.txt:237 en/git-am.txt:73 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:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 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:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
#, ignore-same, no-wrap, priority:300
msgid "-q"
msgstr "-q"
#. type: Plain text
-#: en/fetch-options.txt:231
+#: en/fetch-options.txt:242
#, 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:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 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:190 en/merge-options.txt:150
+#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:401 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:225 en/merge-options.txt:150
#, ignore-same, no-wrap, priority:300
msgid "-v"
msgstr "-v"
#. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 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:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
+#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402 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:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
#, ignore-same, no-wrap, priority:300
msgid "--verbose"
msgstr "--verbose"
#. type: Plain text
-#: en/fetch-options.txt:235 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
+#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
#, priority:300
msgid "Be verbose."
msgstr "詳細が表示されます。"
#. type: Labeled list
-#: en/fetch-options.txt:237 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
+#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
#, ignore-same, no-wrap, priority:300
msgid "--progress"
msgstr "--progress"
#. type: Plain text
-#: en/fetch-options.txt:242 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr "進行状況は、-q が指定されていない限り、端末に接続されているときにデフォルトで標準エラーストリームで報告されます。このフラグは、標準エラーストリームが端末に送信されない場合でも、進行状況を強制します。"
#. type: Labeled list
-#: en/fetch-options.txt:243 en/git-ls-remote.txt:75 en/git-push.txt:215
+#: en/fetch-options.txt:254 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:244 en/git-clone.txt:136 en/git-ls-remote.txt:76
+#: en/fetch-options.txt:255 en/git-clone.txt:136 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:251 en/git-clone.txt:143
+#: en/fetch-options.txt:262 en/git-clone.txt:143
#, 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:252
+#: en/fetch-options.txt:263
#, ignore-same, no-wrap, priority:220
msgid "--show-forced-updates"
msgstr "--show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:257
+#: en/fetch-options.txt:268
#, 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 "デフォルトでは、git はフェッチ中にブランチが強制的に更新されるかどうかをチェックします。 これは fetch.showForcedUpdates で無効にできますが、--show-forced-updates オプションはこのチェックが行われることを保証します。linkgit:git-config[1] を参照してください。"
#. type: Labeled list
-#: en/fetch-options.txt:258
+#: en/fetch-options.txt:269
#, ignore-same, no-wrap, priority:220
msgid "--no-show-forced-updates"
msgstr "--no-show-forced-updates"
#. type: Plain text
-#: en/fetch-options.txt:264
+#: en/fetch-options.txt:275
#, 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 "デフォルトでは、git はフェッチ中にブランチが強制的にアップデートされるかどうかをチェックします。--no-show-forced-updates を渡すか、fetch.showForcedUpdates を false に設定して、パフォーマンス上の理由からこのチェックをスキップします。'git-pull' 中に使用した場合、--ff-only オプションは、fast-forward アップデートを試みる前に、強制アップデートをチェックします。linkgit:git-config[1] を参照してください。"
#. type: Labeled list
-#: en/fetch-options.txt:265 en/git-push.txt:398
+#: en/fetch-options.txt:276 en/git-push.txt:398
#, ignore-same, no-wrap, priority:220
msgid "-4"
msgstr "-4"
#. type: Labeled list
-#: en/fetch-options.txt:266 en/git-push.txt:399
+#: en/fetch-options.txt:277 en/git-push.txt:399
#, ignore-same, no-wrap, priority:220
msgid "--ipv4"
msgstr "--ipv4"
#. type: Plain text
-#: en/fetch-options.txt:268 en/git-push.txt:401
+#: en/fetch-options.txt:279 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr "IPv6 アドレスを無視して、IPv4 アドレスのみを使用します。"
#. type: Labeled list
-#: en/fetch-options.txt:269 en/git-push.txt:402
+#: en/fetch-options.txt:280 en/git-push.txt:402
#, ignore-same, no-wrap, priority:220
msgid "-6"
msgstr "-6"
#. type: Labeled list
-#: en/fetch-options.txt:270 en/git-push.txt:403
+#: en/fetch-options.txt:281 en/git-push.txt:403
#, ignore-same, no-wrap, priority:220
msgid "--ipv6"
msgstr "--ipv6"
#. type: Plain text
-#: en/fetch-options.txt:271 en/git-push.txt:405
+#: en/fetch-options.txt:282 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr "IPv4 アドレスを無視して、IPv6 アドレスのみを使用します。"
@@ -5728,7 +5780,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt: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:36 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt: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:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-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:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt: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:36 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt: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
#, no-wrap, priority:300
msgid "DESCRIPTION"
msgstr ""
@@ -5770,13 +5822,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:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 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:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 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:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 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:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-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:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:108 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:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 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:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 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:30 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:44 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:151 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:357 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, ignore-ellipsis, no-wrap, priority:300
msgid "<pathspec>..."
msgstr ""
@@ -5806,13 +5858,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:483 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:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, ignore-same, no-wrap, priority:300
msgid "-i"
msgstr "-i"
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:484 en/git-rebase.txt:626 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
#, ignore-same, no-wrap, priority:300
msgid "--interactive"
msgstr "--interactive"
@@ -5968,7 +6020,7 @@ msgid "If some files could not be added because of errors indexing them, do not
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
+#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200
#, ignore-same, no-wrap, priority:300
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -6016,31 +6068,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:311 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
+#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
+#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
#, 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:319 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
+#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
#, 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:323 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
+#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
#, 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:354 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 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:355 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap, priority:300
msgid "\\--"
msgstr ""
@@ -6052,7 +6104,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:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 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:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 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:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:511 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 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:135 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:294 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:169 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:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:393
#, no-wrap, priority:300
msgid "EXAMPLES"
msgstr ""
@@ -6094,7 +6146,7 @@ msgid "Because this example lets the shell expand the asterisk (i.e. you are lis
msgstr ""
#. type: Title -
-#: en/git-add.txt:235 en/git-rebase.txt:799
+#: en/git-add.txt:235 en/git-rebase.txt:821
#, no-wrap, priority:300
msgid "INTERACTIVE MODE"
msgstr ""
@@ -6406,7 +6458,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 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:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:597 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:537 en/git-difftool.txt:137 en/git-diff.txt:205 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:415 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap, priority:300
msgid "SEE ALSO"
msgstr ""
@@ -6418,13 +6470,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:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 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:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 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:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:602 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:215 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:419 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 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:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:178 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:419 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:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 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:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 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:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:603 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:216 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:420 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 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:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:179 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:420 en/git-write-tree.txt:42 en/gitglossary.txt:27
#, priority:300
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -6474,7 +6526,7 @@ msgid "The list of mailbox files to read patches from. If you do not supply this
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:476 en/git-revert.txt:101 en/merge-options.txt:80
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101 en/merge-options.txt:80
#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -6516,7 +6568,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6534,7 +6586,7 @@ msgid "Remove everything in body before a scissors line (see linkgit:git-mailinf
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:59 en/git-mailinfo.txt:90
+#: en/git-am.txt:59 en/git-mailinfo.txt:89
#, ignore-same, no-wrap, priority:100
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -6546,7 +6598,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6638,37 +6690,37 @@ msgid "When the patch does not apply cleanly, fall back on 3-way merge if the pa
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:382 en/git-revert.txt:115
+#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115
#, ignore-same, no-wrap, priority:240
msgid "--rerere-autoupdate"
msgstr "--rerere-autoupdate"
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:383 en/git-revert.txt:116
+#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116
#, ignore-same, no-wrap, priority:240
msgid "--no-rerere-autoupdate"
msgstr "--no-rerere-autoupdate"
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:386 en/git-revert.txt:119
+#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:461 en/git-rebase.txt:613
+#. type: Labeled list
+#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:462
#, ignore-same, no-wrap, priority:100
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
#. type: Labeled list
-#: en/git-am.txt:109 en/git-rebase.txt:462
+#: en/git-am.txt:109 en/git-rebase.txt:478
#, no-wrap, priority:100
msgid "--whitespace=<option>"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:419
+#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:420
#, no-wrap, priority:100
msgid "-C<n>"
msgstr ""
@@ -6727,8 +6779,8 @@ msgstr ""
msgid "Run interactively."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:131 en/git-rebase.txt:469 en/git-rebase.txt:611
+#. type: Labeled list
+#: en/git-am.txt:131 en/git-rebase.txt:485
#, ignore-same, no-wrap, priority:100
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -6739,8 +6791,8 @@ msgstr "--committer-date-is-author-date"
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
msgstr ""
-#. type: Plain text
-#: en/git-am.txt:138 en/git-rebase.txt:470 en/git-rebase.txt:612
+#. type: Labeled list
+#: en/git-am.txt:138 en/git-rebase.txt:490
#, ignore-same, no-wrap, priority:100
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -6752,7 +6804,7 @@ msgid "By default the command records the date from the e-mail message as the co
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:145 en/git-rebase.txt:335 en/sequencer.txt:6
+#: en/git-am.txt:145 en/git-rebase.txt:336 en/sequencer.txt:6
#, ignore-same, no-wrap, priority:100
msgid "--skip"
msgstr "--skip"
@@ -6764,37 +6816,37 @@ msgid "Skip the current patch. This is only meaningful when restarting an abort
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:387 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap, priority:280
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:388 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:389 en/git-revert.txt:93 en/merge-options.txt:64
+#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
#, ignore-same, no-wrap, priority:280
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
#. type: Plain text
-#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
+#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:396 en/git-revert.txt:99
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
+#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1
#, ignore-same, no-wrap, priority:240
msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -6824,7 +6876,7 @@ msgid "When a patch failure occurs, <msg> will be printed to the screen before e
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
+#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15
#, ignore-same, no-wrap, priority:240
msgid "--abort"
msgstr "--abort"
@@ -6836,7 +6888,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:256 en/sequencer.txt:10
+#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10
#, ignore-same, no-wrap, priority:240
msgid "--quit"
msgstr "--quit"
@@ -6860,7 +6912,7 @@ msgid "Show the message at which `git am` has stopped due to conflicts. If `raw
msgstr ""
#. type: Title -
-#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:180 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:81 en/git-stash.txt:245 en/git-tag.txt:231
+#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:226 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:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap, priority:280
msgid "DISCUSSION"
msgstr ""
@@ -7042,7 +7094,7 @@ msgid "The files to read the patch from. '-' can be used to read from the stand
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:404 en/merge-options.txt:91
+#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--stat"
msgstr "--stat"
@@ -7080,7 +7132,7 @@ msgstr "--index"
#. type: Plain text
#: en/git-apply.txt:71
#, priority:100
-msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up to date, it is flagged as an error. This flag also causes the index file to be updated."
+msgid "Apply the patch to both the index and the working tree (or merely check that it would apply cleanly to both if `--check` is in effect). Note that `--index` expects index entries and working tree copies for relevant paths to be identical (their contents and metadata such as file mode must match), and will raise an error if they are not, even if the patch would apply cleanly to both the index and the working tree in isolation."
msgstr ""
#. type: Labeled list
@@ -7092,7 +7144,7 @@ msgstr "--cached"
#. type: Plain text
#: en/git-apply.txt:76
#, priority:100
-msgid "Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`."
+msgid "Apply the patch to just the index, without touching the working tree. If `--check` is in effect, merely check that it would apply cleanly to the index entry."
msgstr ""
#. type: Plain text
@@ -7126,7 +7178,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:815
+#: en/git-apply.txt:105 en/rev-list-options.txt:814
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -7180,7 +7232,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
msgstr ""
#. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:263 en/git-rebase.txt:632
#, ignore-same, no-wrap, priority:100
msgid "--apply"
msgstr "--apply"
@@ -7372,7 +7424,7 @@ msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:185 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap, priority:280
msgid "CONFIGURATION"
msgstr ""
@@ -7685,288 +7737,300 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
+#, no-wrap, priority:100
+msgid "--add-file=<file>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-archive.txt:63
+#, priority:100
+msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value for `--prefix` (if any) and the basename of <file>."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-archive.txt:64
#, ignore-same, no-wrap, priority:100
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
#. type: Plain text
-#: en/git-archive.txt:61
+#: en/git-archive.txt:67
#, priority:100
msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:62
+#: en/git-archive.txt:68
#, no-wrap, priority:100
msgid "<extra>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:65
+#: en/git-archive.txt:71
#, priority:100
msgid "This can be any options that the archiver backend understands. See next section."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:66
+#: en/git-archive.txt:72
#, no-wrap, priority:100
msgid "--remote=<repo>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:72
+#: en/git-archive.txt:78
#, priority:100
msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:73
+#: en/git-archive.txt:79
#, ignore-same, no-wrap, priority:100
msgid "--exec=<git-upload-archive>"
msgstr "--exec=<git-upload-archive>"
#. type: Plain text
-#: en/git-archive.txt:76
+#: en/git-archive.txt:82
#, priority:100
msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
+#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
#, no-wrap, priority:240
msgid "<tree-ish>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:79
+#: en/git-archive.txt:85
#, priority:100
msgid "The tree or commit to produce an archive for."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:80
+#: en/git-archive.txt:86
#, no-wrap, priority:100
msgid "<path>"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:84
+#: en/git-archive.txt:90
#, priority:100
msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
msgstr ""
#. type: Title -
-#: en/git-archive.txt:86
+#: en/git-archive.txt:92
#, no-wrap, priority:100
msgid "BACKEND EXTRA OPTIONS"
msgstr ""
#. type: Title ~
-#: en/git-archive.txt:89
+#: en/git-archive.txt:95
#, no-wrap, priority:100
msgid "zip"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:121
#, ignore-same, no-wrap, priority:280
msgid "-0"
msgstr "-0"
#. type: Plain text
-#: en/git-archive.txt:92
+#: en/git-archive.txt:98
#, priority:100
msgid "Store the files instead of deflating them."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:92
+#: en/git-archive.txt:98
#, ignore-same, no-wrap, priority:100
msgid "-9"
msgstr "-9"
#. type: Plain text
-#: en/git-archive.txt:95
+#: en/git-archive.txt:101
#, priority:100
msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:100
+#: en/git-archive.txt:106
#, no-wrap, priority:100
msgid "tar.umask"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:107
+#: en/git-archive.txt:113
#, priority:100
msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:108
+#: en/git-archive.txt:114
#, no-wrap, priority:100
msgid "tar.<format>.command"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:117
+#: en/git-archive.txt:123
#, priority:100
msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:120
+#: en/git-archive.txt:126
#, priority:100
msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:121
+#: en/git-archive.txt:127
#, no-wrap, priority:100
msgid "tar.<format>.remote"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:126
+#: en/git-archive.txt:132
#, priority:100
msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
msgstr ""
#. type: Title -
-#: en/git-archive.txt:129
+#: en/git-archive.txt:135
#, no-wrap, priority:100
msgid "ATTRIBUTES"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:131
+#: en/git-archive.txt:137
#, no-wrap, priority:100
msgid "export-ignore"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:134
+#: en/git-archive.txt:140
#, priority:100
msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:135
+#: en/git-archive.txt:141
#, no-wrap, priority:100
msgid "export-subst"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:139
+#: en/git-archive.txt:145
#, priority:100
msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:147
+#: en/git-archive.txt:153
#, priority:100
msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:150
+#: en/git-archive.txt:156
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:155
+#: en/git-archive.txt:161
#, priority:100
msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:156
+#: en/git-archive.txt:162
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:159
+#: en/git-archive.txt:165
#, priority:100
msgid "Create a compressed tarball for v1.4.0 release."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:160
+#: en/git-archive.txt:166
#, no-wrap, priority:100
msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:163
+#: en/git-archive.txt:169
#, priority:100
msgid "Same as above, but using the builtin tar.gz handling."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:164
+#: en/git-archive.txt:170
#, no-wrap, priority:100
msgid "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:167
+#: en/git-archive.txt:173
#, priority:100
msgid "Same as above, but the format is inferred from the output file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:168
+#: en/git-archive.txt:174
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:172
+#: en/git-archive.txt:178
#, priority:100
msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:173
+#: en/git-archive.txt:179
#, no-wrap, priority:100
msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:177
+#: en/git-archive.txt:183
#, priority:100
msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:178
+#: en/git-archive.txt:184
#, no-wrap, priority:100
msgid "`git archive -o latest.zip HEAD`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:183
+#: en/git-archive.txt:189
#, priority:100
msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file."
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:184
+#: en/git-archive.txt:190
#, no-wrap, priority:100
msgid "`git config tar.tar.xz.command \"xz -c\"`"
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:189
+#: en/git-archive.txt:195
#, priority:100
msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`."
msgstr ""
#. type: Plain text
-#: en/git-archive.txt:194
+#: en/git-archive.txt:200
#, ignore-same, priority:100
msgid "linkgit:gitattributes[5]"
msgstr "linkgit:gitattributes[5]"
@@ -7999,8 +8063,8 @@ msgstr ""
#: en/git-bisect.txt:31
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-" git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]\n"
-"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]\n"
+" git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n"
+"\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n"
" git bisect (bad|new|<term-new>) [<rev>]\n"
" git bisect (good|old|<term-old>) [<rev>...]\n"
" git bisect terms [--term-good | --term-bad]\n"
@@ -8525,13 +8589,31 @@ msgid "If the repository is bare, `--no-checkout` is assumed."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:372
+#: en/git-bisect.txt:371
+#, priority:100
+msgid "Follow only the first parent commit upon seeing a merge commit."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:375
+#, priority:100
+msgid "In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:378
+#, priority:100
+msgid "This option is particularly useful in avoiding false positives when a merged branch contained broken or non-buildable commits, but the merge itself was OK."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bisect.txt:383
#, priority:100
msgid "Automatically bisect a broken build between v1.2 and HEAD:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:377
+#: en/git-bisect.txt:388
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good\n"
@@ -8540,13 +8622,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:380
+#: en/git-bisect.txt:391
#, priority:100
msgid "Automatically bisect a test failure between origin and HEAD:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:385
+#: en/git-bisect.txt:396
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD origin -- # HEAD is bad, origin is good\n"
@@ -8555,13 +8637,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:388 en/git-bisect.txt:442
+#: en/git-bisect.txt:399 en/git-bisect.txt:453
#, priority:100
msgid "Automatically bisect a broken test case:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:397
+#: en/git-bisect.txt:408
#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
@@ -8574,25 +8656,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:403
+#: en/git-bisect.txt:414
#, priority:100
msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:407
+#: en/git-bisect.txt:418
#, priority:100
msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:409
+#: en/git-bisect.txt:420
#, priority:100
msgid "Automatically bisect with temporary modifications (hot-fix):"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:413
+#: en/git-bisect.txt:424
#, no-wrap, priority:100
msgid ""
"$ cat ~/test.sh\n"
@@ -8600,7 +8682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:426
+#: en/git-bisect.txt:437
#, no-wrap, priority:100
msgid ""
"# tweak the working tree by merging the hot-fix branch\n"
@@ -8618,7 +8700,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:429
+#: en/git-bisect.txt:440
#, no-wrap, priority:100
msgid ""
"# undo the tweak to allow clean flipping to the next commit\n"
@@ -8626,7 +8708,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:432
+#: en/git-bisect.txt:443
#, no-wrap, priority:100
msgid ""
"# return control\n"
@@ -8634,13 +8716,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:440
+#: en/git-bisect.txt:451
#, priority:100
msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:447
+#: en/git-bisect.txt:458
#, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n"
@@ -8649,19 +8731,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:451
+#: en/git-bisect.txt:462
#, priority:100
msgid "This shows that you can do without a run script if you write the test on a single line."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:453
+#: en/git-bisect.txt:464
#, priority:100
msgid "Locate a good region of the object graph in a damaged repository"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:463
+#: en/git-bisect.txt:474
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n"
@@ -8675,25 +8757,25 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:465
+#: en/git-bisect.txt:476
#, no-wrap, priority:100
msgid "$ git bisect reset # quit the bisect session\n"
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:470
+#: en/git-bisect.txt:481
#, priority:100
msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:472
+#: en/git-bisect.txt:483
#, priority:100
msgid "Look for a fix instead of a regression in the code"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:477
+#: en/git-bisect.txt:488
#, no-wrap, priority:100
msgid ""
"$ git bisect start\n"
@@ -8702,13 +8784,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:480
+#: en/git-bisect.txt:491
#, priority:100
msgid "or:"
msgstr ""
#. type: delimited block -
-#: en/git-bisect.txt:484
+#: en/git-bisect.txt:495
#, no-wrap, priority:100
msgid ""
"$ git bisect start --term-old broken --term-new fixed\n"
@@ -8717,19 +8799,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-bisect.txt:487
+#: en/git-bisect.txt:498
#, no-wrap, priority:100
msgid "Getting help"
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:491
+#: en/git-bisect.txt:502
#, priority:100
msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description."
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:496
+#: en/git-bisect.txt:507
#, priority:100
msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]."
msgstr ""
@@ -9111,7 +9193,7 @@ msgid "For people who do parsing: to make it more robust, just ignore any lines
msgstr ""
#. type: Title -
-#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:83
+#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
#, no-wrap, priority:260
msgid "MAPPING AUTHORS"
msgstr ""
@@ -9135,7 +9217,7 @@ msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
"\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
-"\t[(--merged | --no-merged) [<commit>]]\n"
+"\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
"\t[--points-at <object>] [--format=<format>]\n"
"\t[(-r | --remotes) | (-a | --all)]\n"
@@ -9216,7 +9298,7 @@ msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, tha
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
+#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:179
#, ignore-same, no-wrap, priority:240
msgid "-d"
msgstr "-d"
@@ -9294,7 +9376,7 @@ msgid "Copy a branch and the corresponding reflog."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:615
+#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:634
#, no-wrap, priority:240
msgid "-C"
msgstr ""
@@ -9318,7 +9400,7 @@ msgid "Turn off branch colors, even when the configuration file gives the defaul
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
#, ignore-same, no-wrap, priority:240
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -9540,121 +9622,121 @@ msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:257
+#: en/git-branch.txt:256
#, priority:240
-msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
+msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:258 en/git-tag.txt:154
+#: en/git-branch.txt:257 en/git-tag.txt:154
#, no-wrap, priority:240
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:262
+#: en/git-branch.txt:260
#, priority:240
-msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
+msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:263
+#: en/git-branch.txt:261
#, no-wrap, priority:240
msgid "<branchname>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:268
+#: en/git-branch.txt:266
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:269 en/git-switch.txt:42
+#: en/git-branch.txt:267 en/git-switch.txt:42
#, no-wrap, priority:240
msgid "<start-point>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:273
+#: en/git-branch.txt:271
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:274
+#: en/git-branch.txt:272
#, no-wrap, priority:240
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:276
+#: en/git-branch.txt:274
#, priority:240
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:277
+#: en/git-branch.txt:275
#, no-wrap, priority:240
msgid "<newbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:280
+#: en/git-branch.txt:278
#, priority:240
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
+#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
#, no-wrap, priority:240
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:291
+#: en/git-branch.txt:289
#, ignore-ellipsis, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:293 en/git-tag.txt:158
+#: en/git-branch.txt:291 en/git-tag.txt:158
#, no-wrap, priority:240
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:295
+#: en/git-branch.txt:293
#, priority:240
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:296
+#: en/git-branch.txt:294
#, no-wrap, priority:240
msgid "--format <format>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:300
+#: en/git-branch.txt:298
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:306
+#: en/git-branch.txt:304
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:310
+#: en/git-branch.txt:308
#, no-wrap, priority:240
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:317
+#: en/git-branch.txt:315
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
@@ -9664,19 +9746,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:321
+#: en/git-branch.txt:319
#, priority:240
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:322
+#: en/git-branch.txt:320
#, no-wrap, priority:240
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:329
+#: en/git-branch.txt:327
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
@@ -9686,25 +9768,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:334
+#: en/git-branch.txt:332
#, priority:240
msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:336
+#: en/git-branch.txt:334
#, priority:240
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:337
+#: en/git-branch.txt:335
#, no-wrap, priority:240
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:342
+#: en/git-branch.txt:340
#, no-wrap, priority:240
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
@@ -9712,61 +9794,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:346
+#: en/git-branch.txt:344
#, priority:240
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:347
+#: en/git-branch.txt:345
#, priority:240
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:349
+#: en/git-branch.txt:347
#, priority:240
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:356
+#: en/git-branch.txt:354
#, priority:240
msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:359
+#: en/git-branch.txt:357
#, priority:240
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:363
+#: en/git-branch.txt:361
#, priority:240
msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:366
+#: en/git-branch.txt:364
#, priority:240
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:369
+#: en/git-branch.txt:367
#, priority:240
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:372
+#: en/git-branch.txt:370
#, priority:240
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
@@ -9916,173 +9998,186 @@ msgid "git-bundle - Move objects and refs by archive"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:16
+#: en/git-bundle.txt:17
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
-"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]\n"
+"\t\t [--version=<version>] <file> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <file>\n"
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:24
+#: en/git-bundle.txt:25
#, priority:100
msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:29
+#: en/git-bundle.txt:30
#, priority:100
msgid "The 'git bundle' command packages objects and references in an archive at the originating machine, which can then be imported into another repository using 'git fetch', 'git pull', or 'git clone', after moving the archive by some means (e.g., by sneakernet)."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:35
+#: en/git-bundle.txt:36
#, priority:100
msgid "As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:39
+#: en/git-bundle.txt:40
#, no-wrap, priority:100
msgid "create [options] <file> <git-rev-list-args>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:44
+#: en/git-bundle.txt:45
#, priority:100
msgid "Used to create a bundle named 'file'. This requires the '<git-rev-list-args>' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:45
+#: en/git-bundle.txt:46
#, no-wrap, priority:100
msgid "verify <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:52
+#: en/git-bundle.txt:53
#, priority:100
msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. 'git bundle' prints a list of missing commits, if any, and exits with a non-zero status."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:53
+#: en/git-bundle.txt:54
#, no-wrap, priority:100
msgid "list-heads <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:57
+#: en/git-bundle.txt:58
#, priority:100
msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:58
+#: en/git-bundle.txt:59
#, no-wrap, priority:100
msgid "unbundle <file>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:64
+#: en/git-bundle.txt:65
#, priority:100
msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:65
+#: en/git-bundle.txt:66
#, no-wrap, priority:100
msgid "<git-rev-list-args>"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:74
+#: en/git-bundle.txt:75
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:76
+#: en/git-bundle.txt:77
#, ignore-ellipsis, no-wrap, priority:100
msgid "[<refname>...]"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:82
+#: en/git-bundle.txt:83
#, priority:100
msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:89 en/git-pack-objects.txt:157
+#: en/git-bundle.txt:90 en/git-pack-objects.txt:157
#, ignore-same, no-wrap, priority:100
msgid "--all-progress"
msgstr "--all-progress"
#. type: Plain text
-#: en/git-bundle.txt:99 en/git-pack-objects.txt:167
+#: en/git-bundle.txt:100 en/git-pack-objects.txt:167
#, priority:100
msgid "When --stdout is specified then progress report is displayed during the object count and compression phases but inhibited during the write-out phase. The reason is that in some cases the output stream is directly linked to another command which may wish to display progress status of its own as it processes incoming pack data. This flag is like --progress except that it forces progress report for the write-out phase as well even if --stdout is used."
msgstr ""
#. type: Labeled list
-#: en/git-bundle.txt:100 en/git-pack-objects.txt:168
+#: en/git-bundle.txt:101 en/git-pack-objects.txt:168
#, ignore-same, no-wrap, priority:100
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
#. type: Plain text
-#: en/git-bundle.txt:104 en/git-pack-objects.txt:172
+#: en/git-bundle.txt:105 en/git-pack-objects.txt:172
#, priority:100
msgid "This is used to imply --all-progress whenever progress display is activated. Unlike --all-progress this flag doesn't actually force any progress display by itself."
msgstr ""
+#. type: Labeled list
+#: en/git-bundle.txt:106
+#, fuzzy, no-wrap, priority:100
+msgid "--version=<version>"
+msgstr "--server-option=<option>"
+
#. type: Plain text
-#: en/git-bundle.txt:109 en/git-pack-objects.txt:176
+#: en/git-bundle.txt:111
+#, priority:100
+msgid "Specify the bundle version. Version 2 is the older format and can only be used with SHA-1 repositories; the newer version 3 contains capabilities that permit extensions. The default is the oldest supported format, based on the hash algorithm in use."
+msgstr ""
+
+#. type: Plain text
+#: en/git-bundle.txt:116 en/git-pack-objects.txt:176
#, priority:100
msgid "This flag makes the command not to report its progress on the standard error stream."
msgstr ""
#. type: Title -
-#: en/git-bundle.txt:111
+#: en/git-bundle.txt:118
#, no-wrap, priority:100
msgid "SPECIFYING REFERENCES"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:121
+#: en/git-bundle.txt:128
#, priority:100
msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads. References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:126
+#: en/git-bundle.txt:133
#, priority:100
msgid "It is very important that the basis used be held by the destination. It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:134
+#: en/git-bundle.txt:141
#, priority:100
msgid "`git clone` can use any bundle created without negative refspecs (e.g., `new`, but not `old..new`). If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:143
+#: en/git-bundle.txt:150
#, priority:100
msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:148
+#: en/git-bundle.txt:155
#, priority:100
msgid "To bootstrap the process, you can first create a bundle that does not have any basis. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:153
+#: en/git-bundle.txt:160
#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
@@ -10091,25 +10186,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:158
+#: en/git-bundle.txt:165
#, priority:100
msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:161
+#: en/git-bundle.txt:168
#, no-wrap, priority:100
msgid "machineB$ git clone -b master /home/me/tmp/file.bundle R2\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:166
+#: en/git-bundle.txt:173
#, priority:100
msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:171
+#: en/git-bundle.txt:178
#, no-wrap, priority:100
msgid ""
"[remote \"origin\"]\n"
@@ -10118,19 +10213,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:176
+#: en/git-bundle.txt:183
#, priority:100
msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:179
+#: en/git-bundle.txt:186
#, priority:100
msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:184
+#: en/git-bundle.txt:191
#, no-wrap, priority:100
msgid ""
"machineA$ cd R1\n"
@@ -10139,13 +10234,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:188
+#: en/git-bundle.txt:195
#, priority:100
msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it."
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:192
+#: en/git-bundle.txt:199
#, no-wrap, priority:100
msgid ""
"machineB$ cd R2\n"
@@ -10153,85 +10248,85 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:200
+#: en/git-bundle.txt:207
#, priority:100
msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the basis, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:202
+#: en/git-bundle.txt:209
#, priority:100
msgid "You can use a tag that is present in both:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:205
+#: en/git-bundle.txt:212
#, no-wrap, priority:100
msgid "$ git bundle create mybundle v1.0.0..master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:208
+#: en/git-bundle.txt:215
#, priority:100
msgid "You can use a basis based on time:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:211
+#: en/git-bundle.txt:218
#, no-wrap, priority:100
msgid "$ git bundle create mybundle --since=10.days master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:214
+#: en/git-bundle.txt:221
#, priority:100
msgid "You can use the number of commits:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:217
+#: en/git-bundle.txt:224
#, no-wrap, priority:100
msgid "$ git bundle create mybundle -10 master\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:221
+#: en/git-bundle.txt:228
#, priority:100
msgid "You can run `git-bundle verify` to see if you can extract from a bundle that was created with a basis:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:224
+#: en/git-bundle.txt:231
#, no-wrap, priority:100
msgid "$ git bundle verify mybundle\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:228
+#: en/git-bundle.txt:235
#, priority:100
msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them."
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:232
+#: en/git-bundle.txt:239
#, priority:100
msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:235
+#: en/git-bundle.txt:242
#, no-wrap, priority:100
msgid "$ git fetch mybundle master:localRef\n"
msgstr ""
#. type: Plain text
-#: en/git-bundle.txt:238
+#: en/git-bundle.txt:245
#, priority:100
msgid "You can also see what references it offers:"
msgstr ""
#. type: delimited block -
-#: en/git-bundle.txt:241
+#: en/git-bundle.txt:248
#, no-wrap, priority:100
msgid "$ git ls-remote mybundle\n"
msgstr ""
@@ -10269,7 +10364,7 @@ msgid "In the second form, a list of objects (separated by linefeeds) is provide
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
+#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:346
#, no-wrap, priority:240
msgid "<object>"
msgstr ""
@@ -10305,7 +10400,7 @@ msgid "Pretty-print the contents of <object> based on its type."
msgstr ""
#. type: Labeled list
-#: en/git-cat-file.txt:52 en/git.txt:363
+#: en/git-cat-file.txt:52 en/git.txt:370
#, no-wrap, priority:100
msgid "<type>"
msgstr ""
@@ -10524,7 +10619,7 @@ msgid ""
msgstr ""
#. 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:190 en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: 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:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap, priority:280
msgid "OUTPUT"
msgstr ""
@@ -10786,19 +10881,19 @@ msgid "is printed when, during symlink resolution, a file is used as a directory
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:375 en/git-svn.txt:999
+#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:396 en/git-svn.txt:999
#, no-wrap, priority:100
msgid "CAVEATS"
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
+#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:404
#, priority:100
msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
msgstr ""
#. type: Plain text
-#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
+#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:408
#, priority:100
msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
msgstr ""
@@ -10848,7 +10943,7 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
#, ignore-same, no-wrap, priority:260
msgid "--stdin"
msgstr "--stdin"
@@ -11376,7 +11471,7 @@ msgid "Only meaningful with `--stdin`; paths are separated with NUL character in
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-checkout.txt:356 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
#, priority:280
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -11817,7 +11912,7 @@ msgid "If `<branch>` is not found but there does exist a tracking branch in exac
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
+#: en/git-checkout.txt:194 en/git-switch.txt:104
#, priority:240
msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
msgstr ""
@@ -11835,265 +11930,265 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
+#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:180
#, ignore-same, no-wrap, priority:240
msgid "--detach"
msgstr "--detach"
#. type: Plain text
-#: en/git-checkout.txt:207
+#: en/git-checkout.txt:208
#, priority:240
msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:208
+#: en/git-checkout.txt:209
#, no-wrap, priority:240
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:214
+#: en/git-checkout.txt:215
#, priority:240
msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:219
+#: en/git-checkout.txt:220
#, priority:240
msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:225
+#: en/git-checkout.txt:226
#, priority:240
msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:232
+#: en/git-checkout.txt:233
#, priority:240
msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:233 en/git-restore.txt:100
+#: en/git-checkout.txt:234 en/git-restore.txt:100
#, ignore-same, no-wrap, priority:240
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
-#: en/git-checkout.txt:238
+#: en/git-checkout.txt:239
#, priority:240
msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:240 en/git-rebase.txt:347 en/git-rebase.txt:619 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
+#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
#, ignore-same, no-wrap, priority:280
msgid "--merge"
msgstr "--merge"
#. type: Plain text
-#: en/git-checkout.txt:249
+#: en/git-checkout.txt:250
#, priority:240
msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:254 en/git-switch.txt:132
+#: en/git-checkout.txt:255 en/git-switch.txt:132
#, priority:240
msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:257
+#: en/git-checkout.txt:258
#, priority:240
msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:259
+#: en/git-checkout.txt:260
#, priority:240
msgid "When switching branches with `--merge`, staged changes may be lost."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:260 en/git-restore.txt:87 en/git-switch.txt:133
+#: en/git-checkout.txt:261 en/git-restore.txt:87 en/git-switch.txt:133
#, no-wrap, priority:240
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:266 en/git-restore.txt:93 en/git-switch.txt:139
+#: en/git-checkout.txt:267 en/git-restore.txt:93 en/git-switch.txt:139
#, priority:240
msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:273
+#: en/git-checkout.txt:274
#, priority:240
msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:277
+#: en/git-checkout.txt:278
#, priority:240
msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:280
+#: en/git-checkout.txt:281
#, priority:240
msgid "Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:281 en/git-switch.txt:175
+#: en/git-checkout.txt:282 en/git-switch.txt:175
#, ignore-same, no-wrap, priority:240
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
-#: en/git-checkout.txt:286
+#: en/git-checkout.txt:287
#, priority:240
msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:287 en/git-merge.txt:90
+#: en/git-checkout.txt:288 en/git-merge.txt:90
#, ignore-same, no-wrap, priority:240
msgid "--overwrite-ignore"
msgstr "--overwrite-ignore"
#. type: Labeled list
-#: en/git-checkout.txt:288 en/git-merge.txt:91
+#: en/git-checkout.txt:289 en/git-merge.txt:91
#, ignore-same, no-wrap, priority:240
msgid "--no-overwrite-ignore"
msgstr "--no-overwrite-ignore"
#. type: Plain text
-#: en/git-checkout.txt:292
+#: en/git-checkout.txt:293
#, priority:240
msgid "Silently overwrite ignored files when switching branches. This is the default behavior. Use `--no-overwrite-ignore` to abort the operation when the new branch contains ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:293 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
+#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
#, ignore-same, no-wrap, priority:240
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
#. type: Plain text
-#: en/git-checkout.txt:302
+#: en/git-checkout.txt:303
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:303 en/git-restore.txt:118
+#: en/git-checkout.txt:304 en/git-restore.txt:118
#, ignore-same, no-wrap, priority:240
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
-#: en/git-checkout.txt:304 en/git-restore.txt:119
+#: en/git-checkout.txt:305 en/git-restore.txt:119
#, ignore-same, no-wrap, priority:240
msgid "--no-overlay"
msgstr "--no-overlay"
#. type: Plain text
-#: en/git-checkout.txt:310
+#: en/git-checkout.txt:311
#, priority:240
msgid "In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:324 en/git-rebase.txt:243 en/git-switch.txt:36
+#: en/git-checkout.txt:325 en/git-rebase.txt:244 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:330
+#: en/git-checkout.txt:331
#, priority:240
msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:334
+#: en/git-checkout.txt:335
#, priority:240
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:338 en/git-switch.txt:58
+#: en/git-checkout.txt:339 en/git-switch.txt:58
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:339
+#: en/git-checkout.txt:340
#, no-wrap, priority:240
msgid "<new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:341 en/git-switch.txt:41
+#: en/git-checkout.txt:342 en/git-switch.txt:41
#, priority:240
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:342
+#: en/git-checkout.txt:343
#, no-wrap, priority:240
msgid "<start_point>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:345
+#: en/git-checkout.txt:346
#, priority:240
msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:349
+#: en/git-checkout.txt:350
#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:353
+#: en/git-checkout.txt:354
#, priority:240
msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:359 en/git-reset.txt:130 en/git-restore.txt:143
+#: en/git-checkout.txt:360 en/git-reset.txt:130 en/git-restore.txt:143
#, priority:280
msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:361 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
+#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:363
+#: en/git-checkout.txt:364
#, no-wrap, priority:240
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:367
+#: en/git-checkout.txt:368
#, priority:240
msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:376
+#: en/git-checkout.txt:377
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12106,19 +12201,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:383
+#: en/git-checkout.txt:384
#, priority:240
msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
+#: en/git-checkout.txt:387 en/git-checkout.txt:422 en/git-checkout.txt:439
#, no-wrap, priority:240
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:394
+#: en/git-checkout.txt:395
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12131,13 +12226,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:400
+#: en/git-checkout.txt:401
#, priority:240
msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:404
+#: en/git-checkout.txt:405
#, no-wrap, priority:240
msgid ""
"$ git checkout v2.0 # or\n"
@@ -12145,7 +12240,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:412
+#: en/git-checkout.txt:413
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'b')\n"
@@ -12158,13 +12253,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:418
+#: en/git-checkout.txt:419
#, priority:240
msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:431
+#: en/git-checkout.txt:432
#, no-wrap, priority:240
msgid ""
" HEAD (refers to commit 'e')\n"
@@ -12179,13 +12274,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:435
+#: en/git-checkout.txt:436
#, priority:240
msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:448
+#: en/git-checkout.txt:449
#, no-wrap, priority:240
msgid ""
"\t HEAD (refers to commit 'f')\n"
@@ -12200,19 +12295,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:452
+#: en/git-checkout.txt:453
#, priority:240
msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:455
+#: en/git-checkout.txt:456
#, no-wrap, priority:240
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:463
+#: en/git-checkout.txt:464
#, no-wrap, priority:240
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -12225,13 +12320,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:470
+#: en/git-checkout.txt:471
#, priority:240
msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:475
+#: en/git-checkout.txt:476
#, no-wrap, priority:240
msgid ""
"$ git checkout -b foo <1>\n"
@@ -12240,31 +12335,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:480
+#: en/git-checkout.txt:481
#, priority:240
msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:483
+#: en/git-checkout.txt:484
#, priority:240
msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:486
+#: en/git-checkout.txt:487
#, priority:240
msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:491
+#: en/git-checkout.txt:492
#, priority:240
msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:495
+#: en/git-checkout.txt:496
#, no-wrap, priority:240
msgid ""
"$ git reflog -2 HEAD # or\n"
@@ -12272,25 +12367,25 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:498
+#: en/git-checkout.txt:499
#, no-wrap, priority:240
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:508
+#: en/git-checkout.txt:509
#, priority:240
msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:515
+#: en/git-checkout.txt:516
#, priority:240
msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:521
+#: en/git-checkout.txt:522
#, no-wrap, priority:240
msgid ""
"$ git checkout master <1>\n"
@@ -12300,73 +12395,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:524
+#: en/git-checkout.txt:525
#, priority:240
msgid "switch branch"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:525 en/git-restore.txt:161
+#: en/git-checkout.txt:526 en/git-restore.txt:161
#, priority:240
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:526
+#: en/git-checkout.txt:527
#, priority:240
msgid "restore `hello.c` from the index"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:529
+#: en/git-checkout.txt:530
#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:532
+#: en/git-checkout.txt:533
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:538
+#: en/git-checkout.txt:539
#, priority:240
msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:542
+#: en/git-checkout.txt:543
#, priority:240
msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:545
+#: en/git-checkout.txt:546
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:549 en/git-switch.txt:201
+#: en/git-checkout.txt:550 en/git-switch.txt:201
#, priority:240
msgid "After working in the wrong branch, switching to the correct branch would be done using:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:552
+#: en/git-checkout.txt:553
#, no-wrap, priority:240
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:557
+#: en/git-checkout.txt:558
#, priority:240
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:561
+#: en/git-checkout.txt:562
#, no-wrap, priority:240
msgid ""
"$ git checkout mytopic\n"
@@ -12374,13 +12469,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:565 en/git-switch.txt:217
+#: en/git-checkout.txt:566 en/git-switch.txt:217
#, priority:240
msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:569
+#: en/git-checkout.txt:570
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12388,19 +12483,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:574 en/git-switch.txt:226
+#: en/git-checkout.txt:575 en/git-switch.txt:226
#, priority:240
msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:577
+#: en/git-checkout.txt:578
#, priority:240
msgid "When a merge conflict happens during switching branches with the `-m` option, you would see something like this:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:583
+#: en/git-checkout.txt:584
#, no-wrap, priority:240
msgid ""
"$ git checkout -m mytopic\n"
@@ -12410,13 +12505,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:589
+#: en/git-checkout.txt:590
#, priority:240
msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:593
+#: en/git-checkout.txt:594
#, no-wrap, priority:240
msgid ""
"$ edit frotz\n"
@@ -12424,7 +12519,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:599
+#: en/git-checkout.txt:600
#, ignore-same, priority:240
msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
@@ -12811,7 +12906,7 @@ msgid "By default, cherry-picking an empty commit will fail, indicating that an
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:327 en/git-rebase.txt:622
+#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328 en/git-rebase.txt:641
#, ignore-same, no-wrap, priority:280
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -12835,7 +12930,7 @@ msgid "If a commit being cherry picked duplicates a commit already in the curren
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:361 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
+#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
msgstr ""
@@ -13049,7 +13144,7 @@ msgid "Show the commit subjects next to the SHA1s."
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:32 en/git-rebase.txt:238
+#: en/git-cherry.txt:32 en/git-rebase.txt:239
#, no-wrap, priority:100
msgid "<upstream>"
msgstr ""
@@ -13061,13 +13156,13 @@ msgid "Upstream branch to search for equivalent commits. Defaults to the upstre
msgstr ""
#. type: Labeled list
-#: en/git-cherry.txt:36 en/git.txt:383
+#: en/git-cherry.txt:36 en/git.txt:390
#, no-wrap, priority:100
msgid "<head>"
msgstr ""
#. type: Plain text
-#: en/git-cherry.txt:38 en/git-rebase.txt:245
+#: en/git-cherry.txt:38 en/git-rebase.txt:246
#, priority:100
msgid "Working branch; defaults to HEAD."
msgstr ""
@@ -13554,9 +13649,9 @@ msgid ""
"other Git command that makes any existing commit unreferenced) in the\n"
"source repository, some objects may become unreferenced (or dangling).\n"
"These objects may be removed by normal Git operations (such as `git commit`)\n"
-"which automatically call `git gc --auto`. (See linkgit:git-gc[1].)\n"
-"If these objects are removed and were referenced by the cloned repository,\n"
-"then the cloned repository will become corrupt.\n"
+"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 ""
#. type: Plain text
@@ -13640,7 +13735,7 @@ msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>`
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
+#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490
#, ignore-same, no-wrap, priority:300
msgid "--sparse"
msgstr "--sparse"
@@ -13652,7 +13747,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:869
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -13724,7 +13819,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:59 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
msgstr ""
@@ -13850,7 +13945,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:62
+#: en/git-clone.txt:287 en/git-init.txt:64
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
msgstr ""
@@ -14178,7 +14273,7 @@ msgid "Normally a commit would identify a new \"HEAD\" state, and while Git does
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:47 en/git.txt:345
+#: en/git-commit-tree.txt:47 en/git.txt:352
#, no-wrap, priority:100
msgid "<tree>"
msgstr ""
@@ -14593,7 +14688,7 @@ msgid "Add Signed-off-by line by the committer at the end of the commit log mess
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:176 en/git-rebase.txt:412 en/merge-options.txt:115
+#: en/git-commit.txt:176 en/git-rebase.txt:413 en/merge-options.txt:115
#, ignore-same, no-wrap, priority:280
msgid "--no-verify"
msgstr "--no-verify"
@@ -15771,7 +15866,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358 en/git.txt:324
+#: en/git-config.txt:358 en/git.txt:331
#, no-wrap, priority:100
msgid ""
"; core variables\n"
@@ -15992,7 +16087,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
+#: en/git-config.txt:478 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:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:413
#, no-wrap, priority:280
msgid "BUGS"
msgstr ""
@@ -16938,16 +17033,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -18743,12 +18832,6 @@ msgstr "--always"
msgid "Show uniquely abbreviated commit object as fallback."
msgstr ""
-#. type: Labeled list
-#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, ignore-same, no-wrap, priority:260
-msgid "--first-parent"
-msgstr "--first-parent"
-
#. type: Plain text
#: en/git-describe.txt:125
#, priority:260
@@ -18892,19 +18975,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:111
+#: en/git-diff-files.txt:25 en/git-diff.txt:112
#, no-wrap, priority:280
msgid "-1 --base"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:112
+#: en/git-diff-files.txt:26 en/git-diff.txt:113
#, no-wrap, priority:280
msgid "-2 --ours"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:113
+#: en/git-diff-files.txt:27 en/git-diff.txt:114
#, no-wrap, priority:280
msgid "-3 --theirs"
msgstr ""
@@ -18922,7 +19005,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/git-log.txt:137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19273,7 +19356,7 @@ msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the c
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:264
+#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:263
#, ignore-same, no-wrap, priority:260
msgid "-g"
msgstr "-g"
@@ -19474,7 +19557,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:126 en/git-submodule.txt:437
#, ignore-ellipsis, no-wrap, priority:280
msgid "<path>..."
msgstr ""
@@ -19570,13 +19653,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
+#: en/git-diff-tree.txt:108 en/git-log.txt:143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
+#: en/git-diff-tree.txt:114 en/git-log.txt:149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -19680,89 +19763,89 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:66
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:71
+#: en/git-diff.txt:74
#, 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 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`."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:72
+#: en/git-diff.txt:75
#, ignore-ellipsis, no-wrap, priority:280
-msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:80
+#: en/git-diff.txt:81
#, 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 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:81
+#: en/git-diff.txt:82
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:88
+#: en/git-diff.txt:89
#, 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:93
+#: en/git-diff.txt:94
#, 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>."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:100
+#: en/git-diff.txt:101
#, 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:101
+#: en/git-diff.txt:102
#, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:105
+#: en/git-diff.txt:106
#, 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:119
+#: en/git-diff.txt:120
#, 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:124
+#: en/git-diff.txt:125
#, 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:129
+#: en/git-diff.txt:130
#, 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:136
+#: en/git-diff.txt:137
#, no-wrap, priority:280
msgid "Various ways to check your working tree"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:142
+#: en/git-diff.txt:143
#, no-wrap, priority:280
msgid ""
"$ git diff <1>\n"
@@ -19771,31 +19854,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:145
+#: en/git-diff.txt:146
#, priority:280
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:147
+#: en/git-diff.txt:148
#, 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:149
+#: en/git-diff.txt:150
#, 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:150
+#: en/git-diff.txt:151
#, no-wrap, priority:280
msgid "Comparing with arbitrary commits"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:156
+#: en/git-diff.txt:157
#, no-wrap, priority:280
msgid ""
"$ git diff test <1>\n"
@@ -19804,31 +19887,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:160
+#: en/git-diff.txt:161
#, 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:163
+#: en/git-diff.txt:164
#, 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:164
+#: en/git-diff.txt:165
#, priority:280
msgid "Compare the version before the last commit and the last commit."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:165
+#: en/git-diff.txt:166
#, no-wrap, priority:280
msgid "Comparing branches"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:171
+#: en/git-diff.txt:172
#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git diff topic master <1>\n"
@@ -19837,31 +19920,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:174
+#: en/git-diff.txt:175
#, priority:280
msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:176 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:177
+#: en/git-diff.txt:178
#, 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:178
+#: en/git-diff.txt:179
#, no-wrap, priority:280
msgid "Limiting the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:184
+#: en/git-diff.txt:185
#, no-wrap, priority:280
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
@@ -19870,31 +19953,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:188
+#: en/git-diff.txt:189
#, priority:280
msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:191
#, priority:280
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:192
#, priority:280
msgid "Limit diff output to named subtrees."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:192
+#: en/git-diff.txt:193
#, no-wrap, priority:280
msgid "Munging the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:197
+#: en/git-diff.txt:198
#, no-wrap, priority:280
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
@@ -19902,19 +19985,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:201
+#: en/git-diff.txt:202
#, priority:280
msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:202
+#: en/git-diff.txt:203
#, priority:280
msgid "Output diff in reverse."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:212
+#: en/git-diff.txt:213
#, 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 ""
@@ -20506,16 +20589,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -21592,7 +21669,7 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:818
#, priority:100
-msgid "where `<object-identifer>` is any string not containing LF."
+msgid "where `<object-identifier>` is any string not containing LF."
msgstr ""
#. type: Plain text
@@ -22339,17 +22416,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22365,18 +22437,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -22931,26 +22997,32 @@ msgstr ""
msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
+#. type: Plain text
+#: en/git-fetch.txt:54
+#, priority:220
+msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported."
+msgstr ""
+
#. type: Title -
-#: en/git-fetch.txt:55
+#: en/git-fetch.txt:59
#, no-wrap, priority:220
msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:61
+#: en/git-fetch.txt:65
#, priority:220
msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:63
+#: en/git-fetch.txt:67
#, priority:220
msgid "Typically such a variable may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:67
+#: en/git-fetch.txt:71
#, no-wrap, priority:220
msgid ""
"[remote \"origin\"]\n"
@@ -22958,55 +23030,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:70
+#: en/git-fetch.txt:74
#, priority:220
msgid "This configuration is used in two ways:"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:80
+#: en/git-fetch.txt:84
#, priority:220
msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:97
+#: en/git-fetch.txt:101
#, priority:220
msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:101
+#: en/git-fetch.txt:105
#, priority:220
msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
msgstr ""
#. type: Title -
-#: en/git-fetch.txt:103
+#: en/git-fetch.txt:107
#, no-wrap, priority:220
msgid "PRUNING"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:108
+#: en/git-fetch.txt:112
#, priority:220
msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:114
+#: en/git-fetch.txt:118
#, priority:220
msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:117
+#: en/git-fetch.txt:121
#, priority:220
msgid "These remote-tracking references can be deleted as a one-off with either of:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:121
+#: en/git-fetch.txt:125
#, no-wrap, priority:220
msgid ""
"# While fetching\n"
@@ -23014,7 +23086,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:124
+#: en/git-fetch.txt:128
#, no-wrap, priority:220
msgid ""
"# Only prune, don't fetch\n"
@@ -23022,49 +23094,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:130
+#: en/git-fetch.txt:134
#, priority:220
msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:135
+#: en/git-fetch.txt:139
#, priority:220
msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <-> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:141
+#: en/git-fetch.txt:145
#, priority:220
msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:146
+#: en/git-fetch.txt:150
#, priority:220
msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:150
+#: en/git-fetch.txt:154
#, priority:220
msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:157
+#: en/git-fetch.txt:161
#, priority:220
msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:161
+#: en/git-fetch.txt:165
#, priority:220
msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:166
+#: en/git-fetch.txt:170
#, no-wrap, priority:220
msgid ""
"# These both fetch tags\n"
@@ -23073,25 +23145,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:172
+#: en/git-fetch.txt:176
#, priority:220
msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:177
+#: en/git-fetch.txt:181
#, priority:220
msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:181
+#: en/git-fetch.txt:185
#, priority:220
msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:187
+#: en/git-fetch.txt:191
#, no-wrap, priority:220
msgid ""
"$ git fetch origin --prune --prune-tags\n"
@@ -23101,229 +23173,229 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:195
+#: en/git-fetch.txt:199
#, priority:220
msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:198
+#: en/git-fetch.txt:202
#, priority:220
msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:201
+#: en/git-fetch.txt:205
#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> [<reason>]\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:205
+#: en/git-fetch.txt:209
#, priority:220
msgid "The status of up-to-date refs is shown only if the --verbose option is used."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:210
+#: en/git-fetch.txt:214
#, priority:220
msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:211 en/git-push.txt:431
+#: en/git-fetch.txt:215 en/git-push.txt:431
#, no-wrap, priority:220
msgid "flag"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:213 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, priority:220
msgid "A single character indicating the status of the ref:"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:213 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:433
#, no-wrap, priority:220
msgid "(space)"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:214
+#: en/git-fetch.txt:218
#, priority:220
msgid "for a successfully fetched fast-forward;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:214 en/git-push.txt:434
+#: en/git-fetch.txt:218 en/git-push.txt:434
#, no-wrap, priority:220
msgid "`+`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:215 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, priority:220
msgid "for a successful forced update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:215 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:435
#, ignore-same, no-wrap, priority:220
msgid "`-`"
msgstr "`-`"
#. type: Plain text
-#: en/git-fetch.txt:216
+#: en/git-fetch.txt:220
#, priority:220
msgid "for a successfully pruned ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:216
+#: en/git-fetch.txt:220
#, ignore-same, no-wrap, priority:220
msgid "`t`"
msgstr "`t`"
#. type: Plain text
-#: en/git-fetch.txt:217
+#: en/git-fetch.txt:221
#, priority:220
msgid "for a successful tag update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:217 en/git-push.txt:436
+#: en/git-fetch.txt:221 en/git-push.txt:436
#, no-wrap, priority:220
msgid "`*`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:218
+#: en/git-fetch.txt:222
#, priority:220
msgid "for a successfully fetched new ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:218 en/git-push.txt:437
+#: en/git-fetch.txt:222 en/git-push.txt:437
#, no-wrap, priority:220
msgid "`!`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:219
+#: en/git-fetch.txt:223
#, priority:220
msgid "for a ref that was rejected or failed to update; and"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:219 en/git-push.txt:438
+#: en/git-fetch.txt:223 en/git-push.txt:438
#, no-wrap, priority:220
msgid "`=`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:220
+#: en/git-fetch.txt:224
#, priority:220
msgid "for a ref that was up to date and did not need fetching."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:221 en/git-push.txt:440
+#: en/git-fetch.txt:225 en/git-push.txt:440
#, no-wrap, priority:220
msgid "summary"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:226
+#: en/git-fetch.txt:230
#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:227 en/git-push.txt:468
+#: en/git-fetch.txt:231 en/git-push.txt:468
#, no-wrap, priority:220
msgid "from"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:231
+#: en/git-fetch.txt:235
#, priority:220
msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1251
+#: en/git-fetch.txt:236 en/git-push.txt:473 en/git-rebase.txt:1273
#, no-wrap, priority:220
msgid "to"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:235
+#: en/git-fetch.txt:239
#, priority:220
msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:236 en/git-push.txt:477
+#: en/git-fetch.txt:240 en/git-push.txt:477
#, no-wrap, priority:220
msgid "reason"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:240
+#: en/git-fetch.txt:244
#, priority:220
msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:245
+#: en/git-fetch.txt:249
#, priority:220
msgid "Update the remote-tracking branches:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:248
+#: en/git-fetch.txt:252
#, no-wrap, priority:220
msgid "$ git fetch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:254
+#: en/git-fetch.txt:258
#, priority:220
msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:256
+#: en/git-fetch.txt:260
#, priority:220
msgid "Using refspecs explicitly:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:259
+#: en/git-fetch.txt:263
#, no-wrap, priority:220
msgid "$ git fetch origin +seen:seen maint:tmp\n"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:264
+#: en/git-fetch.txt:268
#, priority:220
msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:267
+#: en/git-fetch.txt:271
#, priority:220
msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:270
+#: en/git-fetch.txt:274
#, priority:220
msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
msgstr ""
#. type: delimited block -
-#: en/git-fetch.txt:274
+#: en/git-fetch.txt:278
#, no-wrap, priority:220
msgid ""
"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
@@ -23331,13 +23403,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:281
+#: en/git-fetch.txt:285
#, priority:220
msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:292 en/git-pull.txt:248
+#: en/git-fetch.txt:296 en/git-pull.txt:248
#, priority:220
msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
@@ -24354,7 +24426,7 @@ msgid ""
"'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]\n"
"\t\t [(--sort=<key>)...] [--format=<format>] [<pattern>...]\n"
"\t\t [--points-at=<object>]\n"
-"\t\t (--merged[=<object>] | --no-merged[=<object>])\n"
+"\t\t [--merged[=<object>]] [--no-merged[=<object>]]\n"
"\t\t [--contains[=<object>]] [--no-contains[=<object>]]\n"
msgstr ""
@@ -24461,235 +24533,235 @@ msgid "--merged[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:81
+#: en/git-for-each-ref.txt:80
#, priority:100
-msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified), incompatible with `--no-merged`."
+msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:82
+#: en/git-for-each-ref.txt:81
#, no-wrap, priority:100
msgid "--no-merged[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:86
+#: en/git-for-each-ref.txt:84
#, priority:100
-msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified), incompatible with `--merged`."
+msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:87
+#: en/git-for-each-ref.txt:85
#, no-wrap, priority:100
msgid "--contains[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:90
+#: en/git-for-each-ref.txt:88
#, priority:100
msgid "Only list refs which contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:91
+#: en/git-for-each-ref.txt:89
#, no-wrap, priority:100
msgid "--no-contains[=<object>]"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:94
+#: en/git-for-each-ref.txt:92
#, priority:100
msgid "Only list refs which don't contain the specified commit (HEAD if not specified)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:97
+#: en/git-for-each-ref.txt:95
#, priority:100
msgid "Sorting and filtering refs are case insensitive."
msgstr ""
#. type: Title -
-#: en/git-for-each-ref.txt:99
+#: en/git-for-each-ref.txt:97
#, no-wrap, priority:100
msgid "FIELD NAMES"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:104
+#: en/git-for-each-ref.txt:102
#, priority:100
msgid "Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:106
+#: en/git-for-each-ref.txt:104
#, priority:100
msgid "For all objects, the following names can be used:"
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:107
+#: en/git-for-each-ref.txt:105
#, no-wrap, priority:100
msgid "refname"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:123
+#: en/git-for-each-ref.txt:121
#, priority:100
msgid "The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is appended, strips `<N>` slash-separated path components from the front (back) of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a negative number, strip as many path components as necessary from the specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/tags/foo` into `refs`). When the ref does not have enough components, the result becomes an empty string if stripping with positive <N>, or it becomes the full refname if stripping with negative <N>. Neither is an error."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:125
+#: en/git-for-each-ref.txt:123
#, priority:100
msgid "`strip` can be used as a synonym to `lstrip`."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:126
+#: en/git-for-each-ref.txt:124
#, no-wrap, priority:100
msgid "objecttype"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:128
+#: en/git-for-each-ref.txt:126
#, priority:100
msgid "The type of the object (`blob`, `tree`, `commit`, `tag`)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:129
+#: en/git-for-each-ref.txt:127
#, no-wrap, priority:100
msgid "objectsize"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:133
+#: en/git-for-each-ref.txt:131
#, priority:100
msgid "The size of the object (the same as 'git cat-file -s' reports). Append `:disk` to get the size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:133
+#: en/git-for-each-ref.txt:131
#, no-wrap, priority:100
msgid "objectname"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:139
+#: en/git-for-each-ref.txt:137
#, priority:100
msgid "The object name (aka SHA-1). For a non-ambiguous abbreviation of the object name append `:short`. For an abbreviation of the object name with desired length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:139
+#: en/git-for-each-ref.txt:137
#, no-wrap, priority:100
msgid "deltabase"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:143
+#: en/git-for-each-ref.txt:141
#, priority:100
msgid "This expands to the object name of the delta base for the given object, if it is stored as a delta. Otherwise it expands to the null object name (all zeroes)."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:144
+#: en/git-for-each-ref.txt:142
#, no-wrap, priority:100
msgid "upstream"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:154
+#: en/git-for-each-ref.txt:152
#, priority:100
msgid "The name of a local ref which can be considered ``upstream'' from the displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as `refname` above. Additionally respects `:track` to show \"[ahead N, behind M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:track,nobracket` to show tracking information without brackets (i.e \"ahead N, behind M\")."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:161
+#: en/git-for-each-ref.txt:159
#, priority:100
msgid "For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and `%(upstream:remoteref)` refer to the name of the remote and the name of the tracked remote ref, respectively. In other words, the remote-tracking branch can be updated explicitly and individually by using the refspec `%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:165
+#: en/git-for-each-ref.txt:163
#, priority:100
msgid "Has no effect if the ref does not have tracking information associated with it. All the options apart from `nobracket` are mutually exclusive, but if used together the last option is selected."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:166
+#: en/git-for-each-ref.txt:164
#, no-wrap, priority:100
msgid "push"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:172
+#: en/git-for-each-ref.txt:170
#, priority:100
msgid "The name of a local ref which represents the `@{push}` location for the displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. Produces an empty string if no `@{push}` ref is configured."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:173 en/git.txt:376
+#: en/git-for-each-ref.txt:171 en/git.txt:383
#, no-wrap, priority:100
msgid "HEAD"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:176
+#: en/git-for-each-ref.txt:174
#, priority:100
msgid "'*' if HEAD matches current ref (the checked out branch), ' ' otherwise."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:182
+#: en/git-for-each-ref.txt:180
#, priority:100
msgid "Change output color. Followed by `:<colorname>`, where color names are described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. For example, `%(color:bold red)`."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:183
+#: en/git-for-each-ref.txt:181
#, no-wrap, priority:100
msgid "align"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:197
+#: en/git-for-each-ref.txt:195
#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:198
+#: en/git-for-each-ref.txt:196
#, no-wrap, priority:100
msgid "if"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:210
+#: en/git-for-each-ref.txt:208
#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:211
+#: en/git-for-each-ref.txt:209
#, no-wrap, priority:100
msgid "symref"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:216
+#: en/git-for-each-ref.txt:214
#, priority:100
msgid "The ref which the given symbolic ref refers to. If not a symbolic ref, nothing is printed. Respects the `:short`, `:lstrip` and `:rstrip` options in the same way as `refname` above."
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:217
+#: en/git-for-each-ref.txt:215
#, no-wrap, priority:100
msgid "worktreepath"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:221
+#: en/git-for-each-ref.txt:219
#, priority:100
msgid "The absolute path to the worktree in which the ref is checked out, if it is checked out in any linked worktree. Empty string otherwise."
msgstr ""
@@ -24697,7 +24769,7 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:225
#, priority:100
-msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
+msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. Fields `tree` and `parent` can also be used with modifier `:short` and `:short=<length>` just like `objectname`."
msgstr ""
#. type: Plain text
@@ -24707,67 +24779,134 @@ msgid "For commit and tag objects, the special `creatordate` and `creator` field
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:234
+#: en/git-for-each-ref.txt:237
#, priority:100
-msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
+msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component. For email fields (`authoremail`, `committeremail` and `taggeremail`), `:trim` can be appended to get the email without angle brackets, and `:localpart` to get the part before the `@` symbol out of the trimmed email."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:247
+#: en/git-for-each-ref.txt:240
#, priority:100
-msgid "The complete message in a commit and tag object is `contents`. Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line. The next line is `contents:body`, where body is all of the lines after the first blank line. The optional GPG signature is `contents:signature`. The first `N` lines of the message is obtained using `contents:lines=N`. Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
+msgid "The message in a commit or a tag object is `contents`, from which `contents:<part>` can be used to extract various parts out of:"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:241
+#, no-wrap, priority:100
+msgid "contents:size"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:243
+#, priority:100
+msgid "The size in bytes of the commit or tag message."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:244
+#, no-wrap, priority:100
+msgid "contents:subject"
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:251
#, priority:100
+msgid "The first paragraph of the message, which typically is a single line, is taken as the \"subject\" of the commit or the tag message. Instead of `contents:subject`, field `subject` can also be used to obtain same results. `:sanitize` can be appended to `subject` for subject line suitable for filename."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:252
+#, no-wrap, priority:100
+msgid "contents:body"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:255
+#, priority:100
+msgid "The remainder of the commit or the tag message that follows the \"subject\"."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:256
+#, no-wrap, priority:100
+msgid "contents:signature"
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:258
+#, priority:100
+msgid "The optional GPG signature of the tag."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-for-each-ref.txt:259
+#, fuzzy, no-wrap, priority:100
+#| msgid "--comment-lines"
+msgid "contents:lines=N"
+msgstr "--comment-lines"
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:261
+#, priority:100
+msgid "The first `N` lines of the message."
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:268
+#, priority:100
+msgid "Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-for-each-ref.txt:272
+#, priority:100
msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:254
+#: en/git-for-each-ref.txt:275
#, priority:100
msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:258
+#: en/git-for-each-ref.txt:279
#, priority:100
msgid "In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:262
+#: en/git-for-each-ref.txt:283
#, priority:100
msgid "As a special case for the date-type fields, you may specify a format for the date by adding `:` followed by date format name (see the values the `--date` option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:265
+#: en/git-for-each-ref.txt:286
#, priority:100
msgid "Some atoms like %(align) and %(if) always require a matching %(end). We call them \"opening atoms\" and sometimes denote them as %($open)."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:270
+#: en/git-for-each-ref.txt:291
#, priority:100
msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:277
+#: en/git-for-each-ref.txt:298
#, priority:100
msgid "An example directly producing formatted text. Show the most recent 3 tagged commits:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:280 en/git-for-each-ref.txt:296 en/git-for-each-ref.txt:310 en/git-bisect-lk2009.txt:933
+#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317 en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
#, no-wrap, priority:100
msgid "#!/bin/sh\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:286
+#: en/git-for-each-ref.txt:307
#, no-wrap, priority:100
msgid ""
"git for-each-ref --count=3 --sort='-*authordate' \\\n"
@@ -24778,7 +24917,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:289
+#: en/git-for-each-ref.txt:310
#, no-wrap, priority:100
msgid ""
"%(*body)\n"
@@ -24786,13 +24925,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:294
+#: en/git-for-each-ref.txt:315
#, priority:100
msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:303
+#: en/git-for-each-ref.txt:324
#, no-wrap, priority:100
msgid ""
"git for-each-ref --shell --format=\"ref=%(refname)\" refs/heads | \\\n"
@@ -24804,13 +24943,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:308
+#: en/git-for-each-ref.txt:329
#, priority:100
msgid "A bit more elaborate report on tags, demonstrating that the format may be an entire script:"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:315
+#: en/git-for-each-ref.txt:336
#, no-wrap, priority:100
msgid ""
"fmt='\n"
@@ -24820,7 +24959,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:322
+#: en/git-for-each-ref.txt:343
#, no-wrap, priority:100
msgid ""
"\to=%(*objectname)\n"
@@ -24832,7 +24971,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:341
+#: en/git-for-each-ref.txt:362
#, no-wrap, priority:100
msgid ""
"\tkind=Tag\n"
@@ -24856,13 +24995,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:343
+#: en/git-for-each-ref.txt:364
#, no-wrap, priority:100
msgid " $s\n"
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:350
+#: en/git-for-each-ref.txt:371
#, no-wrap, priority:100
msgid ""
"Its message reads as:\n"
@@ -24874,7 +25013,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:356
+#: en/git-for-each-ref.txt:377
#, no-wrap, priority:100
msgid ""
"eval=`git for-each-ref --shell --format=\"$fmt\" \\\n"
@@ -24885,25 +25024,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:361
+#: en/git-for-each-ref.txt:382
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(else)...%(end). This prefixes the current branch with a star."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:364
+#: en/git-for-each-ref.txt:385
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
-#: en/git-for-each-ref.txt:369
+#: en/git-for-each-ref.txt:390
#, ignore-ellipsis, priority:100
msgid "An example to show the usage of %(if)...%(then)...%(end). This prints the authorname, if present."
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:372
+#: en/git-for-each-ref.txt:393
#, no-wrap, priority:100
msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
msgstr ""
@@ -25639,7 +25778,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-Knig diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -26409,7 +26548,7 @@ msgid "The database has an object whose hash doesn't match the object database v
msgstr ""
#. type: Title -
-#: en/git-fsck.txt:162 en/git.txt:408
+#: en/git-fsck.txt:162 en/git.txt:415
#, no-wrap, priority:100
msgid "Environment Variables"
msgstr ""
@@ -27109,7 +27248,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27125,7 +27264,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1110
+#: en/git-grep.txt:220 en/rev-list-options.txt:1109
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -27317,7 +27456,7 @@ msgid "--or"
msgstr "--or"
#. type: Labeled list
-#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
+#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:133
#, ignore-same, no-wrap, priority:260
msgid "--not"
msgstr "--not"
@@ -27479,7 +27618,7 @@ msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Win
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:60
#, no-wrap, priority:240
msgid "COMMANDS"
msgstr ""
@@ -27533,7 +27672,7 @@ msgid "Display the currently running version of 'git gui'."
msgstr ""
#. type: Title -
-#: en/git-gui.txt:52 en/git-imap-send.txt:63 en/git-whatchanged.txt:29
+#: en/git-gui.txt:52 en/git-whatchanged.txt:29
#, no-wrap, priority:100
msgid "Examples"
msgstr ""
@@ -27772,7 +27911,7 @@ msgstr ""
#: en/git-help.txt:13
#, no-wrap, priority:100
msgid ""
-"'git help' [-a|--all [--[no-]verbose]] [-g|--guide]\n"
+"'git help' [-a|--all [--[no-]verbose]] [-g|--guides]\n"
"\t [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]\n"
msgstr ""
@@ -27791,7 +27930,7 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:26
#, priority:100
-msgid "If the option `--guide` or `-g` is given, a list of the useful Git guides is also printed on the standard output."
+msgid "If the option `--guides` or `-g` is given, a list of the Git concept guides is also printed on the standard output."
msgstr ""
#. type: Plain text
@@ -27857,7 +27996,7 @@ msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:63
#, priority:100
-msgid "Prints a list of useful guides on the standard output. This option overrides any given command or guide name."
+msgid "Prints a list of the Git concept guides on the standard output. This option overrides any given command or guide name."
msgstr ""
#. type: Labeled list
@@ -28873,17 +29012,17 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
#, priority:100
-msgid "To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values."
+msgid "To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:66
+#: en/git-imap-send.txt:62
#, priority:100
msgid "Using tunnel mode:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:71
+#: en/git-imap-send.txt:67
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28892,13 +29031,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:74
+#: en/git-imap-send.txt:70
#, priority:100
msgid "Using direct mode:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:81
+#: en/git-imap-send.txt:77
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28909,13 +29048,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:84
+#: en/git-imap-send.txt:80
#, priority:100
msgid "Using direct mode with SSL:"
msgstr ""
#. type: delimited block .
-#: en/git-imap-send.txt:93
+#: en/git-imap-send.txt:89
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28924,17 +29063,23 @@ msgid ""
" user = bob\n"
" pass = p4ssw0rd\n"
" port = 123\n"
-" sslverify = false\n"
+" ; sslVerify = false\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-imap-send.txt:98
+#, priority:100
+msgid "You may want to use `sslVerify=false` while troubleshooting, if you suspect that the reason you are having trouble connecting is because the certificate you use at the private server `example.com` you are trying to set up (or have set up) may not be verified correctly."
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:100
#, priority:100
-msgid "To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig to specify your account settings:"
+msgid "Using Gmail's IMAP interface:"
msgstr ""
#. type: delimited block -
-#: en/git-imap-send.txt:108
+#: en/git-imap-send.txt:107
#, no-wrap, priority:100
msgid ""
"[imap]\n"
@@ -28942,47 +29087,52 @@ msgid ""
"\thost = imaps://imap.gmail.com\n"
"\tuser = user@gmail.com\n"
"\tport = 993\n"
-"\tsslverify = false\n"
msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:112
#, priority:100
-msgid "You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get an error that the \"Folder doesn't exist\"."
+msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
+msgstr ""
+
+#. type: Plain text
+#: en/git-imap-send.txt:116
+#, priority:100
+msgid "If your Gmail account is set to another language than English, the name of the \"Drafts\" folder will be localized."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:114
+#: en/git-imap-send.txt:118
#, priority:100
msgid "Once the commits are ready to be sent, run the following command:"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:116
+#: en/git-imap-send.txt:120
#, no-wrap, priority:100
msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:120
+#: en/git-imap-send.txt:124
#, priority:100
-msgid "Just make sure to disable line wrapping in the email client (GMail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
+msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
msgstr ""
#. type: Title -
-#: en/git-imap-send.txt:122
+#: en/git-imap-send.txt:126
#, no-wrap, priority:100
msgid "CAUTION"
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:129
+#: en/git-imap-send.txt:133
#, priority:100
msgid "It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project. Many projects do not like patches to be attached. Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail. You will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:133
+#: en/git-imap-send.txt:137
#, no-wrap, priority:100
msgid ""
"Thunderbird in particular is known to be problematic. Thunderbird\n"
@@ -28991,7 +29141,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-imap-send.txt:137
+#: en/git-imap-send.txt:141
#, priority:100
msgid "linkgit:git-format-patch[1], linkgit:git-send-email[1], mbox(5)"
msgstr ""
@@ -29156,19 +29306,19 @@ msgid "This option cannot be used with --stdin."
msgstr ""
#. type: Plain text
-#: en/git-index-pack.txt:111
+#: en/git-index-pack.txt:113
#, priority:100
-msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
+msgid "Once the index has been created, the hash that goes into the name of the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
msgstr ""
#. type: Block title
-#: en/git-index-pack.txt:111
+#: en/git-index-pack.txt:113
#, no-wrap, priority:100
msgid "keep file used as a lock to prevent the race with 'git repack'"
msgstr ""
#. type: Plain text
-#: en/git-index-pack.txt:113
+#: en/git-index-pack.txt:115
#, priority:100
msgid "mentioned above."
msgstr ""
@@ -29268,187 +29418,187 @@ msgid "Specify the given object format (hash algorithm) for the repository. The
msgstr ""
#. type: Plain text
-#: en/git-init.txt:61
+#: en/git-init.txt:63
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:68
+#: en/git-init.txt:70
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:70
+#: en/git-init.txt:72
#, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:71
-#, no-wrap, priority:300
-msgid "-b <branch-name"
-msgstr ""
+#: en/git-init.txt:73
+#, fuzzy, no-wrap, priority:300
+msgid "-b <branch-name>"
+msgstr "-L :<funcname>"
#. type: Labeled list
-#: en/git-init.txt:72
+#: en/git-init.txt:74
#, no-wrap, priority:300
msgid "--initial-branch=<branch-name>"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:76
+#: en/git-init.txt:78
#, priority:300
msgid "Use the specified name for the initial branch in the newly created repository. If not specified, fall back to the default name: `master`."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:77
+#: en/git-init.txt:79
#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:85
+#: en/git-init.txt:87
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:88
+#: en/git-init.txt:90
#, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:90
+#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'umask' (or 'false')"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:94
+#: en/git-init.txt:96
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:95
+#: en/git-init.txt:97
#, no-wrap, priority:300
msgid "'group' (or 'true')"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:103
+#: en/git-init.txt:105
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:104
+#: en/git-init.txt:106
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:107
+#: en/git-init.txt:109
#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:108
+#: en/git-init.txt:110
#, no-wrap, priority:300
msgid "'0xxx'"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:115
+#: en/git-init.txt:117
#, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:120
+#: en/git-init.txt:122
#, priority:300
msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:123
+#: en/git-init.txt:125
#, priority:300
msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
msgstr ""
#. type: Title -
-#: en/git-init.txt:125
+#: en/git-init.txt:127
#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:129
+#: en/git-init.txt:131
#, priority:300
msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:131
+#: en/git-init.txt:133
#, priority:300
msgid "The template directory will be one of the following (in order):"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:133
+#: en/git-init.txt:135
#, priority:300
msgid "the argument given with the `--template` option;"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:137
#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:137
+#: en/git-init.txt:139
#, priority:300
msgid "the `init.templateDir` configuration variable; or"
msgstr ""
#. type: Plain text
-#: en/git-init.txt:139
+#: en/git-init.txt:141
#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:142
+#: en/git-init.txt:144
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:145
+#: en/git-init.txt:147
#, priority:300
msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:147
+#: en/git-init.txt:149
#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
msgstr ""
#. type: Labeled list
-#: en/git-init.txt:151
+#: en/git-init.txt:153
#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
msgstr ""
#. type: delimited block -
-#: en/git-init.txt:158
+#: en/git-init.txt:160
#, no-wrap, priority:300
msgid ""
"$ cd /path/to/my/codebase\n"
@@ -29458,19 +29608,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-init.txt:161
+#: en/git-init.txt:163
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:162
+#: en/git-init.txt:164
#, priority:300
msgid "Add all existing files to the index."
msgstr ""
#. type: Plain text
-#: en/git-init.txt:163
+#: en/git-init.txt:165
#, priority:300
msgid "Record the pristine state as the first commit in the history."
msgstr ""
@@ -30329,409 +30479,458 @@ msgid "Shows the commit logs."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:22
+#: en/git-log.txt:25
#, priority:260
-msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
+msgid "The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to the linkgit:git-diff[1] command to control how the changes each commit introduces are shown."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:27
+#: en/git-log.txt:30
#, ignore-same, no-wrap, priority:260
msgid "--follow"
msgstr "--follow"
#. type: Plain text
-#: en/git-log.txt:30
+#: en/git-log.txt:33
#, priority:260
msgid "Continue listing the history of a file beyond renames (works only for a single file)."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:31
+#: en/git-log.txt:34
#, ignore-same, no-wrap, priority:260
msgid "--no-decorate"
msgstr "--no-decorate"
#. type: Labeled list
-#: en/git-log.txt:32
+#: en/git-log.txt:35
#, no-wrap, priority:260
msgid "--decorate[=short|full|auto|no]"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:40
+#: 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'."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:41
+#: en/git-log.txt:44
#, no-wrap, priority:260
msgid "--decorate-refs=<pattern>"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:42
+#: en/git-log.txt:45
#, no-wrap, priority:260
msgid "--decorate-refs-exclude=<pattern>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:50
+#: en/git-log.txt:53
#, 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:51
+#: en/git-log.txt:54
#, ignore-same, no-wrap, priority:260
msgid "--source"
msgstr "--source"
#. type: Plain text
-#: en/git-log.txt:54
+#: en/git-log.txt:57
#, 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:55
+#: en/git-log.txt:58
#, ignore-same, no-wrap, priority:260
msgid "--[no-]mailmap"
msgstr "--[no-]mailmap"
#. type: Labeled list
-#: en/git-log.txt:56
+#: en/git-log.txt:59
#, ignore-same, no-wrap, priority:260
msgid "--[no-]use-mailmap"
msgstr "--[no-]use-mailmap"
#. type: Plain text
-#: en/git-log.txt:60
+#: en/git-log.txt:63
#, 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:61
+#: en/git-log.txt:64
#, ignore-same, no-wrap, priority:260
msgid "--full-diff"
msgstr "--full-diff"
#. type: Plain text
-#: en/git-log.txt:67
+#: en/git-log.txt:70
#, 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:70
+#: en/git-log.txt:73
#, 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:71
+#: en/git-log.txt:74
#, ignore-same, no-wrap, priority:260
msgid "--log-size"
msgstr "--log-size"
#. type: Plain text
-#: en/git-log.txt:76
+#: en/git-log.txt:79
#, 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:77
+#: en/git-log.txt:80
#, no-wrap, priority:260
msgid "-L <start>,<end>:<file>"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:78
+#: en/git-log.txt:81
#, no-wrap, priority:260
msgid "-L :<funcname>:<file>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:89
+#: en/git-log.txt:92
#, priority:260
msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:92 en/git-shortlog.txt:63
+#: en/git-log.txt:95 en/git-shortlog.txt:92
#, no-wrap, priority:260
msgid "<revision range>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:100
+#: en/git-log.txt:103
#, 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:101 en/git-shortlog.txt:72
+#: en/git-log.txt:104 en/git-shortlog.txt:101
#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:106
+#: en/git-log.txt:109
#, 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:109 en/git-shortlog.txt:78
+#: en/git-log.txt:112 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:115 en/git-show.txt:49
+#: en/git-log.txt:118
#, no-wrap, priority:260
-msgid "COMMON DIFF OPTIONS"
+msgid "DIFF FORMATTING"
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:122
+#, 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:129
+#, priority:260
+msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never 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 merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:136
+#, priority:260
+msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:142
+#, priority:260
+msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
+msgstr ""
+
+#. type: Plain text
+#: en/git-log.txt:157
+#, priority:260
+msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-log.txt:158
+#, fuzzy, no-wrap, priority:260
+#| msgid "diffmerge"
+msgid "--diff-merges=off"
+msgstr "diffmerge"
+
+#. type: Labeled list
+#: en/git-log.txt:159
+#, ignore-same, no-wrap, priority:260
+msgid "--no-diff-merges"
+msgstr "--no-diff-merges"
+
+#. type: Plain text
+#: en/git-log.txt:162
+#, priority:260
+msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:124
+#: en/git-log.txt:170
#, no-wrap, priority:260
msgid "`git log --no-merges`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:127
+#: en/git-log.txt:173
#, priority:260
msgid "Show the whole commit history, but skip any merges"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:128
+#: en/git-log.txt:174
#, no-wrap, priority:260
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:132
+#: en/git-log.txt:178
#, 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:133
+#: en/git-log.txt:179
#, no-wrap, priority:260
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:138
+#: en/git-log.txt:184
#, 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:139
+#: en/git-log.txt:185
#, no-wrap, priority:260
msgid "`git log --name-status release..test`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:144
+#: en/git-log.txt:190
#, 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:145
+#: en/git-log.txt:191
#, no-wrap, priority:260
msgid "`git log --follow builtin/rev-list.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:150
+#: en/git-log.txt:196
#, 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:151
+#: en/git-log.txt:197
#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:156
+#: en/git-log.txt:202
#, 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:157
+#: en/git-log.txt:203
#, no-wrap, priority:260
msgid "`git log master --not --remotes=*/master`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:161
+#: en/git-log.txt:207
#, 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:162
+#: en/git-log.txt:208
#, no-wrap, priority:260
msgid "`git log -p -m --first-parent`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:169
+#: en/git-log.txt:215
#, 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:170
+#: en/git-log.txt:216
#, no-wrap, priority:260
msgid "`git log -L '/int main/',/^}/:main.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:174
+#: en/git-log.txt:220
#, priority:260
msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:175
+#: en/git-log.txt:221
#, no-wrap, priority:260
msgid "`git log -3`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:178
+#: en/git-log.txt:224
#, priority:260
msgid "Limits the number of commits to show to 3."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:189
+#: en/git-log.txt:235
#, 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:190
+#: en/git-log.txt:236
#, ignore-same, no-wrap, priority:260
msgid "format.pretty"
msgstr "format.pretty"
#. type: Plain text
-#: en/git-log.txt:193
+#: en/git-log.txt:239
#, priority:260
msgid "Default for the `--format` option. (See 'Pretty Formats' above.) Defaults to `medium`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:194
+#: en/git-log.txt:240
#, ignore-same, no-wrap, priority:260
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
#. type: Plain text
-#: en/git-log.txt:198
+#: en/git-log.txt:244
#, 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:199
+#: en/git-log.txt:245
#, ignore-same, no-wrap, priority:260
msgid "log.date"
msgstr "log.date"
#. type: Plain text
-#: en/git-log.txt:203
+#: en/git-log.txt:249
#, 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:207
+#: en/git-log.txt:253
#, 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:208
+#: en/git-log.txt:254
#, ignore-same, no-wrap, priority:260
msgid "log.follow"
msgstr "log.follow"
#. type: Plain text
-#: en/git-log.txt:213
+#: en/git-log.txt:259
#, 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:214
+#: en/git-log.txt:260
#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
-#: en/git-log.txt:219
+#: en/git-log.txt:265
#, 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:220
+#: en/git-log.txt:266
#, ignore-same, no-wrap, priority:260
msgid "log.showSignature"
msgstr "log.showSignature"
#. type: Plain text
-#: en/git-log.txt:223
+#: en/git-log.txt:269
#, 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:224
+#: en/git-log.txt:270
#, no-wrap, priority:260
msgid "mailmap.*"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:226
+#: en/git-log.txt:272
#, priority:260
msgid "See linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:227 en/git-notes.txt:333
+#: en/git-log.txt:273 en/git-notes.txt:333
#, no-wrap, priority:260
msgid "notes.displayRef"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:232
+#: en/git-log.txt:278
#, 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:236
+#: en/git-log.txt:282
#, 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:240
+#: en/git-log.txt:286
#, 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 ""
@@ -31060,7 +31259,7 @@ msgid "?"
msgstr ""
#. type: Title ~
-#: en/git-ls-files.txt:132 en/git.txt:578
+#: en/git-ls-files.txt:132 en/git.txt:587
#, no-wrap, priority:100
msgid "other"
msgstr ""
@@ -31126,7 +31325,7 @@ msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tre
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
+#: en/git-ls-files.txt:185 en/git.txt:374 en/git-update-index.txt:230
#, no-wrap, priority:100
msgid "<file>"
msgstr ""
@@ -31611,49 +31810,49 @@ msgid "Copy the Message-ID header at the end of the commit message. This is use
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:82
+#: en/git-mailinfo.txt:81
#, priority:100
-msgid "Remove everything in body before a scissors line. A line that mainly consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") marks is called a scissors line, and is used to request the reader to cut the message at that line. If such a line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
+msgid "Remove everything in body before a scissors line (e.g. \"-- >8 --\"). The line represents scissors and perforation marks, and is used to request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:87
+#: en/git-mailinfo.txt:86
#, priority:100
msgid "This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:89
+#: en/git-mailinfo.txt:88
#, priority:100
msgid "This can be enabled by default with the configuration option mailinfo.scissors."
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:92
+#: en/git-mailinfo.txt:91
#, priority:100
msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
msgstr ""
#. type: Labeled list
-#: en/git-mailinfo.txt:93
+#: en/git-mailinfo.txt:92
#, no-wrap, priority:100
msgid "<msg>"
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:96
+#: en/git-mailinfo.txt:95
#, priority:100
msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
msgstr ""
#. type: Labeled list
-#: en/git-mailinfo.txt:97
+#: en/git-mailinfo.txt:96
#, no-wrap, priority:100
msgid "<patch>"
msgstr ""
#. type: Plain text
-#: en/git-mailinfo.txt:99
+#: en/git-mailinfo.txt:98
#, priority:100
msgid "The patch extracted from e-mail."
msgstr ""
@@ -31870,7 +32069,7 @@ msgid "Check if the first <commit> is an ancestor of the second <commit>, and ex
msgstr ""
#. type: Labeled list
-#: en/git-merge-base.txt:60 en/git-rebase.txt:440
+#: en/git-merge-base.txt:60 en/git-rebase.txt:441
#, ignore-same, no-wrap, priority:100
msgid "--fork-point"
msgstr "--fork-point"
@@ -33507,7 +33706,7 @@ msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:56 en/git-worktree.txt:81
+#: en/git-notes.txt:56 en/git-worktree.txt:95
#, ignore-same, no-wrap, priority:240
msgid "list"
msgstr "list"
@@ -33615,7 +33814,7 @@ msgid "If conflicts arise and a strategy for automatically resolving conflicting
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:112 en/git-worktree.txt:105
+#: en/git-notes.txt:112 en/git-worktree.txt:122
#, ignore-same, no-wrap, priority:240
msgid "remove"
msgstr "remove"
@@ -33627,7 +33826,7 @@ msgid "Remove the notes for given objects (defaults to HEAD). When giving zero o
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:118 en/git-worktree.txt:101
+#: en/git-notes.txt:118 en/git-worktree.txt:118
#, ignore-same, no-wrap, priority:240
msgid "prune"
msgstr "prune"
@@ -33741,7 +33940,7 @@ msgid "Do not remove anything; just report the object names whose notes would be
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:360 en/merge-options.txt:119
+#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:119
#, no-wrap, priority:240
msgid "-s <strategy>"
msgstr ""
@@ -33785,7 +33984,7 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
#, ignore-ellipsis, priority:100
-msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
+msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
msgstr ""
#. type: Plain text
@@ -35653,7 +35852,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:855
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35875,7 +36074,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:916
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35887,145 +36086,145 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:923
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:926
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:274
+#: en/git-pack-objects.txt:276
#, priority:100
-msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. This is the default action."
+msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. If the repository is a partial clone, an attempt to fetch missing objects will be made before declaring them missing. This is the default action."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
-#, priority:260
-msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
+#: en/git-pack-objects.txt:280
+#, priority:100
+msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. No fetch of a missing object will occur. Missing objects will silently be omitted from the results."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:282
+#: en/git-pack-objects.txt:285
#, priority:100
-msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing object will raise an error."
+msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. No fetch of a missing object will occur. An unexpected missing object will raise an error."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
+#: en/git-pack-objects.txt:286 en/rev-list-options.txt:941
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
#. type: Plain text
-#: en/git-pack-objects.txt:289
+#: en/git-pack-objects.txt:292
#, priority:100
msgid "Omit objects that are known to be in the promisor remote. (This option has the purpose of operating only on locally created objects, so that when we repack, we still maintain a distinction between locally created objects [without .promisor] and objects from the promisor remote [with .promisor].) This is used with partial clone."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:290 en/git-repack.txt:157
+#: en/git-pack-objects.txt:293 en/git-repack.txt:157
#, ignore-same, no-wrap, priority:100
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:295
+#: en/git-pack-objects.txt:298
#, priority:100
msgid "Objects unreachable from the refs in packs named with --unpacked= option are added to the resulting pack, in addition to the reachable objects that are not in packs marked with *.keep files. This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:296
+#: en/git-pack-objects.txt:299
#, ignore-same, no-wrap, priority:100
msgid "--pack-loose-unreachable"
msgstr "--pack-loose-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:299
+#: en/git-pack-objects.txt:302
#, priority:100
msgid "Pack unreachable loose objects (and their loose counterparts removed). This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:300
+#: en/git-pack-objects.txt:303
#, ignore-same, no-wrap, priority:100
msgid "--unpack-unreachable"
msgstr "--unpack-unreachable"
#. type: Plain text
-#: en/git-pack-objects.txt:302
+#: en/git-pack-objects.txt:305
#, priority:100
msgid "Keep unreachable objects in loose form. This implies `--revs`."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:303 en/git-repack.txt:164
+#: en/git-pack-objects.txt:306 en/git-repack.txt:164
#, ignore-same, no-wrap, priority:100
msgid "--delta-islands"
msgstr "--delta-islands"
#. type: Plain text
-#: en/git-pack-objects.txt:306
+#: en/git-pack-objects.txt:309
#, priority:100
msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below."
msgstr ""
#. type: Title -
-#: en/git-pack-objects.txt:309
+#: en/git-pack-objects.txt:312
#, no-wrap, priority:100
msgid "DELTA ISLANDS"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:321
+#: en/git-pack-objects.txt:324
#, priority:100
msgid "When possible, `pack-objects` tries to reuse existing on-disk deltas to avoid having to search for new ones on the fly. This is an important optimization for serving fetches, because it means the server can avoid inflating most objects at all and just send the bytes directly from disk. This optimization can't work when an object is stored as a delta against a base which the receiver does not have (and which we are not already sending). In that case the server \"breaks\" the delta and has to find a new one, which has a high CPU cost. Therefore it's important for performance that the set of objects in on-disk delta relationships match what a client would fetch."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:326
+#: en/git-pack-objects.txt:329
#, priority:100
msgid "In a normal repository, this tends to work automatically. The objects are mostly reachable from the branches and tags, and that's what clients fetch. Any deltas we find on the server are likely to be between objects the client has or will have."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:336
+#: en/git-pack-objects.txt:339
#, priority:100
msgid "But in some repository setups, you may have several related but separate groups of ref tips, with clients tending to fetch those groups independently. For example, imagine that you are hosting several \"forks\" of a repository in a single shared object store, and letting clients view them as separate repositories through `GIT_NAMESPACE` or separate repos using the alternates mechanism. A naive repack may find that the optimal delta for an object is against a base that is only found in another fork. But when a client fetches, they will not have the base object, and we'll have to find a new delta on the fly."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:342
+#: en/git-pack-objects.txt:345
#, priority:100
msgid "A similar situation may exist if you have many refs outside of `refs/heads/` and `refs/tags/` that point to related objects (e.g., `refs/pull` or `refs/changes` used by some hosting providers). By default, clients fetch only heads and tags, and deltas against objects found only in those other groups cannot be sent as-is."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:350
+#: en/git-pack-objects.txt:353
#, priority:100
msgid "Delta islands solve this problem by allowing you to group your refs into distinct \"islands\". Pack-objects computes which objects are reachable from which islands, and refuses to make a delta from an object `A` against a base which is not present in all of `A`'s islands. This results in slightly larger packs (because we miss some delta opportunities), but guarantees that a fetch of one island will not have to recompute deltas on the fly due to crossing island boundaries."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:356
+#: en/git-pack-objects.txt:359
#, priority:100
msgid "When repacking with delta islands the delta window tends to get clogged with candidates that are forbidden by the config. Repacking with a big --window helps (and doesn't take as long as it otherwise might because we can reject some object pairs based on islands before doing any computation on the content)."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:360
+#: en/git-pack-objects.txt:363
#, priority:100
msgid "Islands are configured via the `pack.island` option, which can be specified multiple times. Each value is a left-anchored regular expressions matching refnames. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-pack-objects.txt:365
+#: en/git-pack-objects.txt:368
#, no-wrap, priority:100
msgid ""
"[pack]\n"
@@ -36034,25 +36233,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:372
+#: en/git-pack-objects.txt:375
#, priority:100
msgid "puts heads and tags into an island (whose name is the empty string; see below for more on naming). Any refs which do not match those regular expressions (e.g., `refs/pull/123`) is not in any island. Any object which is reachable only from `refs/pull/` (but not heads or tags) is therefore not a candidate to be used as a base for `refs/heads/`."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:380
+#: en/git-pack-objects.txt:383
#, priority:100
msgid "Refs are grouped into islands based on their \"names\", and two regexes that produce the same name are considered to be in the same island. The names are computed from the regexes by concatenating any capture groups from the regex, with a '-' dash in between. (And if there are no capture groups, then the name is the empty string, as in the above example.) This allows you to create arbitrary numbers of islands. Only up to 14 such capture groups are supported though."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:384
+#: en/git-pack-objects.txt:387
#, priority:100
msgid "For example, imagine you store the refs for each fork in `refs/virtual/ID`, where `ID` is a numeric identifier. You might then configure:"
msgstr ""
#. type: delimited block -
-#: en/git-pack-objects.txt:390
+#: en/git-pack-objects.txt:393
#, no-wrap, priority:100
msgid ""
"[pack]\n"
@@ -36062,19 +36261,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:395
+#: en/git-pack-objects.txt:398
#, priority:100
msgid "That puts the heads and tags for each fork in their own island (named \"1234\" or similar), and the pull refs for each go into their own \"1234-pull\"."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:399
+#: en/git-pack-objects.txt:402
#, priority:100
msgid "Note that we pick a single island for each regex to go into, using \"last one wins\" ordering (which allows repo-specific config to take precedence over user-wide config, and so forth)."
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:405
+#: en/git-pack-objects.txt:408
#, ignore-same, priority:100
msgid "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
@@ -36434,7 +36633,7 @@ msgid "Show progress."
msgstr ""
#. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:194
+#: en/git-prune.txt:48 en/git-worktree.txt:229
#, no-wrap, priority:240
msgid "--expire <time>"
msgstr ""
@@ -38754,337 +38953,337 @@ msgid " git rebase --abort\n"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:210
+#: en/git-rebase.txt:211
#, no-wrap, priority:100
msgid "--onto <newbase>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:215
+#: en/git-rebase.txt:216
#, priority:100
msgid "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>. May be any valid commit, and not just an existing branch name."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:219
+#: en/git-rebase.txt:220
#, ignore-ellipsis, priority:100
msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:220
+#: en/git-rebase.txt:221
#, ignore-same, no-wrap, priority:100
msgid "--keep-base"
msgstr "--keep-base"
#. type: Plain text
-#: en/git-rebase.txt:225
+#: en/git-rebase.txt:226
#, ignore-ellipsis, priority:100
msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:230
+#: en/git-rebase.txt:231
#, priority:100
msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:235
+#: en/git-rebase.txt:236
#, priority:100
msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:237 en/git-rebase.txt:268 en/git-rebase.txt:287 en/git-rebase.txt:308 en/git-rebase.txt:326 en/git-rebase.txt:334 en/git-rebase.txt:359 en/git-rebase.txt:372 en/git-rebase.txt:381 en/git-rebase.txt:426 en/git-rebase.txt:460 en/git-rebase.txt:468 en/git-rebase.txt:475 en/git-rebase.txt:482 en/git-rebase.txt:494 en/git-rebase.txt:534 en/git-rebase.txt:559 en/git-rebase.txt:571 en/git-rebase.txt:590
+#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288 en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335 en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382 en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484 en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516 en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593 en/git-rebase.txt:612
#, priority:100
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:242
+#: en/git-rebase.txt:243
#, priority:100
msgid "Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:248
+#: en/git-rebase.txt:249
#, priority:100
msgid "Restart the rebasing process after having resolved a merge conflict."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:255
+#: en/git-rebase.txt:256
#, priority:100
msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:261
+#: en/git-rebase.txt:262
#, priority:100
msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:266
+#: en/git-rebase.txt:267
#, priority:100
msgid "Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:269
+#: en/git-rebase.txt:270
#, no-wrap, priority:100
msgid "--empty={drop,keep,ask}"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:280
+#: en/git-rebase.txt:281
#, priority:100
msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes). With drop (the default), commits that become empty are dropped. With keep, such commits are kept. With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes. Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:285
+#: en/git-rebase.txt:286
#, ignore-ellipsis, priority:100
msgid "Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:288 en/git-rebase.txt:628
+#: en/git-rebase.txt:289 en/git-rebase.txt:647
#, ignore-same, no-wrap, priority:100
msgid "--no-keep-empty"
msgstr "--no-keep-empty"
#. type: Labeled list
-#: en/git-rebase.txt:289
+#: en/git-rebase.txt:290
#, ignore-same, no-wrap, priority:100
msgid "--keep-empty"
msgstr "--keep-empty"
#. type: Plain text
-#: en/git-rebase.txt:297
+#: en/git-rebase.txt:298
#, priority:100
msgid "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result. The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to `git commit`, signifying that a user is very intentionally creating such a commit and thus wants to keep it."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:303
+#: en/git-rebase.txt:304
#, priority:100
msgid "Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don't want. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:306
+#: en/git-rebase.txt:307
#, priority:100
msgid "For commits which do not start empty but become empty after rebasing, see the --empty flag."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:309 en/git-rebase.txt:630
+#: en/git-rebase.txt:310 en/git-rebase.txt:649
#, ignore-same, no-wrap, priority:100
msgid "--reapply-cherry-picks"
msgstr "--reapply-cherry-picks"
#. type: Labeled list
-#: en/git-rebase.txt:310
+#: en/git-rebase.txt:311
#, ignore-same, no-wrap, priority:100
msgid "--no-reapply-cherry-picks"
msgstr "--no-reapply-cherry-picks"
#. type: Plain text
-#: en/git-rebase.txt:316
+#: en/git-rebase.txt:317
#, priority:100
msgid "Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the `--empty` flag.)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:321
+#: en/git-rebase.txt:322
#, priority:100
msgid "By default (or if `--no-reapply-cherry-picks` is given), these commits will be automatically dropped. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:324
+#: en/git-rebase.txt:325
#, priority:100
msgid "`--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:332
+#: en/git-rebase.txt:333
#, priority:100
msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:337
+#: en/git-rebase.txt:338
#, priority:100
msgid "Restart the rebasing process by skipping the current patch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:338 en/git-rebase.txt:631
+#: en/git-rebase.txt:339 en/git-rebase.txt:650
#, ignore-same, no-wrap, priority:100
msgid "--edit-todo"
msgstr "--edit-todo"
#. type: Plain text
-#: en/git-rebase.txt:340
+#: en/git-rebase.txt:341
#, priority:100
msgid "Edit the todo list during an interactive rebase."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:341
+#: en/git-rebase.txt:342
#, ignore-same, no-wrap, priority:100
msgid "--show-current-patch"
msgstr "--show-current-patch"
#. type: Plain text
-#: en/git-rebase.txt:345
+#: en/git-rebase.txt:346
#, priority:100
msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:351
+#: en/git-rebase.txt:352
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:357
+#: en/git-rebase.txt:358
#, priority:100
msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch. In other words, the sides are swapped."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:365
+#: en/git-rebase.txt:366
#, priority:100
msgid "Use the given merge strategy. If there is no `-s` option 'git merge-recursive' is used instead. This implies --merge."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:370
+#: en/git-rebase.txt:371
#, priority:100
msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:373
+#: en/git-rebase.txt:374
#, no-wrap, priority:100
msgid "-X <strategy-option>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:374
+#: en/git-rebase.txt:375
#, no-wrap, priority:100
msgid "--strategy-option=<strategy-option>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:379
+#: en/git-rebase.txt:380
#, priority:100
msgid "Pass the <strategy-option> through to the merge strategy. This implies `--merge` and, if no strategy has been specified, `-s recursive`. Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:399
+#: en/git-rebase.txt:400
#, priority:100
msgid "Be quiet. Implies --no-stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:403
+#: en/git-rebase.txt:404
#, priority:100
msgid "Be verbose. Implies --stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:407
+#: en/git-rebase.txt:408
#, priority:100
msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:411
+#: en/git-rebase.txt:412
#, priority:100
msgid "Do not show a diffstat as part of the rebase process."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:414
+#: en/git-rebase.txt:415
#, priority:100
msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:415 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, ignore-same, no-wrap, priority:240
msgid "--verify"
msgstr "--verify"
#. type: Plain text
-#: en/git-rebase.txt:418
+#: en/git-rebase.txt:419
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:424
+#: en/git-rebase.txt:425
#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:427 en/merge-options.txt:43
+#: en/git-rebase.txt:428 en/merge-options.txt:43
#, ignore-same, no-wrap, priority:240
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
-#: en/git-rebase.txt:428
+#: en/git-rebase.txt:429
#, ignore-same, no-wrap, priority:100
msgid "--force-rebase"
msgstr "--force-rebase"
#. type: Plain text
-#: en/git-rebase.txt:433
+#: en/git-rebase.txt:434
#, priority:100
msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones. This ensures that the entire history of the rebased branch is composed of new commits."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:439
+#: en/git-rebase.txt:440
#, priority:100
msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:441
+#: en/git-rebase.txt:442
#, ignore-same, no-wrap, priority:100
msgid "--no-fork-point"
msgstr "--no-fork-point"
#. type: Plain text
-#: en/git-rebase.txt:445
+#: en/git-rebase.txt:446
#, priority:100
msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:451
+#: en/git-rebase.txt:452
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:454
+#: en/git-rebase.txt:455
#, priority:100
msgid "If <upstream> is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:458
+#: en/git-rebase.txt:459
#, priority:100
msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
msgstr ""
@@ -39092,728 +39291,658 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:466
#, priority:100
-msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
+msgid "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:473
+#: en/git-rebase.txt:472
#, priority:100
-msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
+msgid "apply backend: When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the \"old\" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:480
+#: en/git-rebase.txt:477
+#, priority:100
+msgid "merge backend: Treat lines with only whitespace changes as unchanged when merging. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:482
+#, priority:100
+msgid "This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:489
+#, priority:100
+msgid "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies `--force-rebase`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-rebase.txt:491
+#, ignore-same, no-wrap, priority:100
+msgid "--reset-author-date"
+msgstr "--reset-author-date"
+
+#. type: Plain text
+#: en/git-rebase.txt:495
+#, priority:100
+msgid "Instead of using the author date of the original commit, use the current time as the\tauthor date of the rebased commit. This option implies `--force-rebase`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rebase.txt:502
#, priority:100
msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:488
+#: en/git-rebase.txt:510
#, priority:100
msgid "Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:492
+#: en/git-rebase.txt:514
#, priority:100
msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat. A customized instruction format will automatically have the long commit hash prepended to the format."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:496
+#: en/git-rebase.txt:518
#, no-wrap, priority:100
msgid "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:504
+#: en/git-rebase.txt:526
#, priority:100
msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch. With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:511
+#: en/git-rebase.txt:533
#, priority:100
msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:515
+#: en/git-rebase.txt:537
#, priority:100
msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:519
+#: en/git-rebase.txt:541
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:521
+#: en/git-rebase.txt:543
#, priority:100
msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:523 en/git-rebase.txt:625
+#: en/git-rebase.txt:545 en/git-rebase.txt:644
#, ignore-same, no-wrap, priority:100
msgid "--preserve-merges"
msgstr "--preserve-merges"
#. type: Plain text
-#: en/git-rebase.txt:528
+#: en/git-rebase.txt:550
#, priority:100
msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:532
+#: en/git-rebase.txt:554
#, priority:100
msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:535
+#: en/git-rebase.txt:557
#, no-wrap, priority:100
msgid "-x <cmd>"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:536
+#: en/git-rebase.txt:558
#, no-wrap, priority:100
msgid "--exec <cmd>"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:541
+#: en/git-rebase.txt:563
#, priority:100
msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:544
+#: en/git-rebase.txt:566
#, priority:100
msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:546
+#: en/git-rebase.txt:568
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:548
+#: en/git-rebase.txt:570
#, priority:100
msgid "or by giving more than one `--exec`:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:550
+#: en/git-rebase.txt:572
#, ignore-ellipsis, no-wrap, priority:100
msgid "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:554
+#: en/git-rebase.txt:576
#, priority:100
msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:557
+#: en/git-rebase.txt:579
#, priority:100
msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:569
+#: en/git-rebase.txt:591
#, priority:100
msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase the root commit(s) on a branch. When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change. When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:572
+#: en/git-rebase.txt:594
#, ignore-same, no-wrap, priority:100
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:573
+#: en/git-rebase.txt:595
#, ignore-same, no-wrap, priority:100
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
-#: en/git-rebase.txt:584
+#: en/git-rebase.txt:606
#, ignore-ellipsis, priority:100
msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:588
+#: en/git-rebase.txt:610
#, priority:100
msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:591 en/merge-options.txt:163
+#: en/git-rebase.txt:613 en/merge-options.txt:163
#, ignore-same, no-wrap, priority:240
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
-#: en/git-rebase.txt:592 en/merge-options.txt:164
+#: en/git-rebase.txt:614 en/merge-options.txt:164
#, ignore-same, no-wrap, priority:240
msgid "--no-autostash"
msgstr "--no-autostash"
#. type: Plain text
-#: en/git-rebase.txt:598
+#: en/git-rebase.txt:620
#, priority:100
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:599
+#: en/git-rebase.txt:621
#, ignore-same, no-wrap, priority:100
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
-#: en/git-rebase.txt:600
+#: en/git-rebase.txt:622
#, ignore-same, no-wrap, priority:100
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
#. type: Plain text
-#: en/git-rebase.txt:603
+#: en/git-rebase.txt:625
#, priority:100
msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:605
+#: en/git-rebase.txt:627
#, no-wrap, priority:100
msgid "INCOMPATIBLE OPTIONS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:608
+#: en/git-rebase.txt:630
#, priority:100
msgid "The following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:614
+#: en/git-rebase.txt:633
#, ignore-same, priority:100
msgid "--whitespace"
msgstr "--whitespace"
#. type: Plain text
-#: en/git-rebase.txt:617
+#: en/git-rebase.txt:636
#, priority:100
msgid "are incompatible with the following options:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:620
+#: en/git-rebase.txt:639
#, ignore-same, priority:100
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
-#: en/git-rebase.txt:621
+#: en/git-rebase.txt:640
#, ignore-same, priority:100
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
-#: en/git-rebase.txt:623
+#: en/git-rebase.txt:642
#, ignore-same, priority:100
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Labeled list
-#: en/git-rebase.txt:624 en/git-svn.txt:680
+#: en/git-rebase.txt:643 en/git-svn.txt:680
#, ignore-same, no-wrap, priority:100
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
-#: en/git-rebase.txt:627
+#: en/git-rebase.txt:646
#, ignore-same, priority:100
msgid "--exec"
msgstr "--exec"
#. type: Plain text
-#: en/git-rebase.txt:629
+#: en/git-rebase.txt:648
#, priority:100
msgid "--empty="
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:632
+#: en/git-rebase.txt:651
#, priority:100
msgid "--root when used in combination with --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:634
+#: en/git-rebase.txt:653
#, priority:100
msgid "In addition, the following pairs of options are incompatible:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:636
+#: en/git-rebase.txt:655
#, priority:100
msgid "--preserve-merges and --interactive"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:637
+#: en/git-rebase.txt:656
#, priority:100
msgid "--preserve-merges and --signoff"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:638
+#: en/git-rebase.txt:657
#, priority:100
msgid "--preserve-merges and --rebase-merges"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:639
+#: en/git-rebase.txt:658
#, priority:100
msgid "--preserve-merges and --empty="
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:640
+#: en/git-rebase.txt:659
+#, fuzzy, priority:100
+#| msgid "--ignore-whitespace"
+msgid "--preserve-merges and --ignore-whitespace"
+msgstr "--ignore-whitespace"
+
+#. type: Plain text
+#: en/git-rebase.txt:660
+#, fuzzy, priority:100
+#| msgid "--committer-date-is-author-date"
+msgid "--preserve-merges and --committer-date-is-author-date"
+msgstr "--committer-date-is-author-date"
+
+#. type: Plain text
+#: en/git-rebase.txt:661
+#, fuzzy, priority:100
+#| msgid "--preserve-merges"
+msgid "--preserve-merges and --ignore-date"
+msgstr "--preserve-merges"
+
+#. type: Plain text
+#: en/git-rebase.txt:662
#, priority:100
msgid "--keep-base and --onto"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:641
+#: en/git-rebase.txt:663
#, priority:100
msgid "--keep-base and --root"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:642
+#: en/git-rebase.txt:664
#, priority:100
msgid "--fork-point and --root"
msgstr ""
-#. type: Plain text
-#: en/git-rebase.txt:644
-#, priority:100
-msgid "BEHAVIORAL DIFFERENCES"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:653
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:656
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:661
+#. type: Title -
+#: en/git-rebase.txt:666
#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:665
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#. type: Plain text
+#: en/git-rebase.txt:675
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:671
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
-#: en/git-rebase.txt:674
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Plain text
+#: en/git-rebase.txt:683
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#. type: Plain text
+#: en/git-rebase.txt:687
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:686
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#. type: Plain text
+#: en/git-rebase.txt:693
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:689
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:704
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#. type: Plain text
+#: en/git-rebase.txt:705
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:707
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#. type: Plain text
+#: en/git-rebase.txt:708
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
+#. type: Title ~
#: en/git-rebase.txt:710
-#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
+
+#. type: Plain text
+#: en/git-rebase.txt:726
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:721
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#. type: Plain text
+#: en/git-rebase.txt:729
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:724
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:727
-#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+#. type: Plain text
+#: en/git-rebase.txt:743
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:740
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#. type: Plain text
+#: en/git-rebase.txt:746
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:743
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:751
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#. type: Plain text
+#: en/git-rebase.txt:762
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:754
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:761
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#. type: Plain text
+#: en/git-rebase.txt:773
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:764
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:768
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#. type: Plain text
+#: en/git-rebase.txt:783
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:772
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:778
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#. type: Plain text
+#: en/git-rebase.txt:790
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:781
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+#. type: Plain text
+#: en/git-rebase.txt:794
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
+#. type: Plain text
+#: en/git-rebase.txt:800
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:785
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#. type: Plain text
+#: en/git-rebase.txt:803
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:790
+#: en/git-rebase.txt:812
#, priority:100
msgid "You should understand the implications of using 'git rebase' on a repository that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:795
+#: en/git-rebase.txt:817
#, priority:100
msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template pre-rebase hook script for an example."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:797
+#: en/git-rebase.txt:819
#, priority:100
msgid "Upon completion, <branch> will be the current branch."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:804
+#: en/git-rebase.txt:826
#, priority:100
msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:806
+#: en/git-rebase.txt:828
#, priority:100
msgid "The interactive mode is meant for this type of workflow:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:808
+#: en/git-rebase.txt:830
#, priority:100
msgid "have a wonderful idea"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:809
+#: en/git-rebase.txt:831
#, priority:100
msgid "hack on the code"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:810
+#: en/git-rebase.txt:832
#, priority:100
msgid "prepare a series for submission"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:811
+#: en/git-rebase.txt:833
#, priority:100
msgid "submit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:813
+#: en/git-rebase.txt:835
#, priority:100
msgid "where point 2. consists of several instances of"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:815
+#: en/git-rebase.txt:837
#, priority:100
msgid "regular use"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:817
+#: en/git-rebase.txt:839
#, priority:100
msgid "finish something worthy of a commit"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:818 en/git-update-ref.txt:135
+#: en/git-rebase.txt:840 en/git-update-ref.txt:135
#, no-wrap, priority:100
msgid "commit"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:820
+#: en/git-rebase.txt:842
#, priority:100
msgid "independent fixup"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:822
+#: en/git-rebase.txt:844
#, priority:100
msgid "realize that something does not work"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:823
+#: en/git-rebase.txt:845
#, priority:100
msgid "fix that"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:824
+#: en/git-rebase.txt:846
#, priority:100
msgid "commit it"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:830
+#: en/git-rebase.txt:852
#, priority:100
msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:832
+#: en/git-rebase.txt:854
#, priority:100
msgid "Start it with the last commit you want to retain as-is:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:834
+#: en/git-rebase.txt:856
#, no-wrap, priority:100
msgid "\tgit rebase -i <after-this-commit>\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:839
+#: en/git-rebase.txt:861
#, priority:100
msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:844
+#: en/git-rebase.txt:866
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee The oneline of this commit\n"
@@ -39822,73 +39951,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:849
+#: en/git-rebase.txt:871
#, priority:100
msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:854
+#: en/git-rebase.txt:876
#, priority:100
msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:857
+#: en/git-rebase.txt:879
#, priority:100
msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:860
+#: en/git-rebase.txt:882
#, priority:100
msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:863
+#: en/git-rebase.txt:885
#, priority:100
msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:871
+#: en/git-rebase.txt:893
#, priority:100
msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:875
+#: en/git-rebase.txt:897
#, priority:100
msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:879
+#: en/git-rebase.txt:901
#, priority:100
msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:882
+#: en/git-rebase.txt:904
#, no-wrap, priority:100
msgid "$ git rebase -i HEAD~5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:885
+#: en/git-rebase.txt:907
#, priority:100
msgid "And move the first patch to the end of the list."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:888
+#: en/git-rebase.txt:910
#, priority:100
msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:895
+#: en/git-rebase.txt:917
#, no-wrap, priority:100
msgid ""
" X\n"
@@ -39899,25 +40028,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:899
+#: en/git-rebase.txt:921
#, priority:100
msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:902
+#: en/git-rebase.txt:924
#, no-wrap, priority:100
msgid "$ git rebase -i -r --onto Q O\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:909
+#: en/git-rebase.txt:931
#, priority:100
msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:918
+#: en/git-rebase.txt:940
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"pick deadbee Implement feature XXX\n"
@@ -39930,31 +40059,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:923
+#: en/git-rebase.txt:945
#, priority:100
msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:928
+#: en/git-rebase.txt:950
#, ignore-ellipsis, priority:100
msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:931
+#: en/git-rebase.txt:953
#, no-wrap, priority:100
msgid "$ git rebase -i --exec \"make test\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:935
+#: en/git-rebase.txt:957
#, priority:100
msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:945
+#: en/git-rebase.txt:967
#, no-wrap, priority:100
msgid ""
"pick 5928aea one\n"
@@ -39968,85 +40097,85 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:948
+#: en/git-rebase.txt:970
#, no-wrap, priority:100
msgid "SPLITTING COMMITS"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:954
+#: en/git-rebase.txt:976
#, priority:100
msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:958
+#: en/git-rebase.txt:980
#, priority:100
msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split. In fact, any commit range will do, as long as it contains that commit."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:960
+#: en/git-rebase.txt:982
#, priority:100
msgid "Mark the commit you want to split with the action \"edit\"."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:964
+#: en/git-rebase.txt:986
#, priority:100
msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the HEAD is rewound by one, and the index follows suit. However, the working tree stays the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:968
+#: en/git-rebase.txt:990
#, priority:100
msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:971
+#: en/git-rebase.txt:993
#, priority:100
msgid "Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:973
+#: en/git-rebase.txt:995
#, priority:100
msgid "Repeat the last two steps until your working tree is clean."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:975
+#: en/git-rebase.txt:997
#, priority:100
msgid "Continue the rebase with `git rebase --continue`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:980
+#: en/git-rebase.txt:1002
#, priority:100
msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:983
+#: en/git-rebase.txt:1005
#, no-wrap, priority:100
msgid "RECOVERING FROM UPSTREAM REBASE"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:990
+#: en/git-rebase.txt:1012
#, priority:100
msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:995
+#: en/git-rebase.txt:1017
#, priority:100
msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1002
+#: en/git-rebase.txt:1024
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40057,13 +40186,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1005
+#: en/git-rebase.txt:1027
#, priority:100
msgid "If 'subsystem' is rebased against 'master', the following happens:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1012
+#: en/git-rebase.txt:1034
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40074,13 +40203,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1016
+#: en/git-rebase.txt:1038
#, priority:100
msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1023
+#: en/git-rebase.txt:1045
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40091,73 +40220,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1030
+#: en/git-rebase.txt:1052
#, priority:100
msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1032
+#: en/git-rebase.txt:1054
#, priority:100
msgid "There are two kinds of fixes, discussed in the following subsections:"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:1033
+#: en/git-rebase.txt:1055
#, no-wrap, priority:100
msgid "Easy case: The changes are literally the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1037
+#: en/git-rebase.txt:1059
#, priority:100
msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:1038
+#: en/git-rebase.txt:1060
#, no-wrap, priority:100
msgid "Hard case: The changes are not the same."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1045
+#: en/git-rebase.txt:1067
#, priority:100
msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:1048
+#: en/git-rebase.txt:1070
#, no-wrap, priority:100
msgid "The easy case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1053
+#: en/git-rebase.txt:1075
#, priority:100
msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1058
+#: en/git-rebase.txt:1080
#, priority:100
msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream (unless `--reapply-cherry-picks` is given). So if you say (assuming you're on 'topic')"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1060
+#: en/git-rebase.txt:1082
#, no-wrap, priority:100
msgid " $ git rebase subsystem\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1062
+#: en/git-rebase.txt:1084
#, priority:100
msgid "you will end up with the fixed history"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1068
+#: en/git-rebase.txt:1090
#, no-wrap, priority:100
msgid ""
" o---o---o---o---o---o---o---o master\n"
@@ -40168,19 +40297,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rebase.txt:1072
+#: en/git-rebase.txt:1094
#, no-wrap, priority:100
msgid "The hard case"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1076
+#: en/git-rebase.txt:1098
#, priority:100
msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1081
+#: en/git-rebase.txt:1103
#, no-wrap, priority:100
msgid ""
"While an \"easy case recovery\" sometimes appears to be successful\n"
@@ -40190,67 +40319,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1086
+#: en/git-rebase.txt:1108
#, priority:100
msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1090
+#: en/git-rebase.txt:1112
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1093
+#: en/git-rebase.txt:1115
#, priority:100
msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1096
+#: en/git-rebase.txt:1118
#, priority:100
msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1098
+#: en/git-rebase.txt:1120
#, no-wrap, priority:100
msgid " $ git rebase --onto subsystem subsystem@{1}\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1103
+#: en/git-rebase.txt:1125
#, priority:100
msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
msgstr ""
#. type: Title -
-#: en/git-rebase.txt:1105
+#: en/git-rebase.txt:1127
#, no-wrap, priority:100
msgid "REBASING MERGES"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1113
+#: en/git-rebase.txt:1135
#, priority:100
msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1117
+#: en/git-rebase.txt:1139
#, priority:100
msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1122
+#: en/git-rebase.txt:1144
#, priority:100
msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1132
+#: en/git-rebase.txt:1154
#, no-wrap, priority:100
msgid ""
"* Merge branch 'report-a-bug'\n"
@@ -40264,25 +40393,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1139
+#: en/git-rebase.txt:1161
#, priority:100
msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1142
+#: en/git-rebase.txt:1164
#, priority:100
msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1145 en/git-rebase.txt:1222
+#: en/git-rebase.txt:1167 en/git-rebase.txt:1244
#, no-wrap, priority:100
msgid "label onto\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1151
+#: en/git-rebase.txt:1173
#, no-wrap, priority:100
msgid ""
"# Branch: refactor-button\n"
@@ -40293,7 +40422,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1156
+#: en/git-rebase.txt:1178
#, no-wrap, priority:100
msgid ""
"# Branch: report-a-bug\n"
@@ -40303,7 +40432,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1160
+#: en/git-rebase.txt:1182
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40312,55 +40441,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1164
+#: en/git-rebase.txt:1186
#, priority:100
msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1172
+#: en/git-rebase.txt:1194
#, priority:100
msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1179
+#: en/git-rebase.txt:1201
#, priority:100
msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1185
+#: en/git-rebase.txt:1207
#, priority:100
msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1188
+#: en/git-rebase.txt:1210
#, priority:100
msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1195
+#: en/git-rebase.txt:1217
#, priority:100
msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1199
+#: en/git-rebase.txt:1221
#, priority:100
msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1206
+#: en/git-rebase.txt:1228
#, priority:100
msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1213
+#: en/git-rebase.txt:1235
#, no-wrap, priority:100
msgid ""
"pick 192837 Switch from GNU Makefiles to CMake\n"
@@ -40371,13 +40500,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1219
+#: en/git-rebase.txt:1241
#, priority:100
msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1225
+#: en/git-rebase.txt:1247
#, no-wrap, priority:100
msgid ""
"pick afbecd http: add support for TLS v1.3\n"
@@ -40385,7 +40514,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1232
+#: en/git-rebase.txt:1254
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40397,7 +40526,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1236
+#: en/git-rebase.txt:1258
#, no-wrap, priority:100
msgid ""
"reset onto\n"
@@ -40406,37 +40535,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1245
+#: en/git-rebase.txt:1267
#, priority:100
msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead). Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results. Use `--rebase-merges` in such scenarios instead."
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1247
+#: en/git-rebase.txt:1269
#, priority:100
msgid "For example, an attempt to rearrange"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1249
+#: en/git-rebase.txt:1271
#, no-wrap, priority:100
msgid "1 --- 2 --- 3 --- 4 --- 5\n"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1253
+#: en/git-rebase.txt:1275
#, no-wrap, priority:100
msgid "1 --- 2 --- 4 --- 3 --- 5\n"
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:1255
+#: en/git-rebase.txt:1277
#, priority:100
msgid "by moving the \"pick 4\" line will result in the following history:"
msgstr ""
#. type: delimited block -
-#: en/git-rebase.txt:1259
+#: en/git-rebase.txt:1281
#, no-wrap, priority:100
msgid ""
"\t3\n"
@@ -40951,7 +41080,7 @@ msgid "Process the reflogs of all references."
msgstr ""
#. type: Labeled list
-#: en/git-reflog.txt:75 en/rev-list-options.txt:193
+#: en/git-reflog.txt:75 en/rev-list-options.txt:192
#, ignore-same, no-wrap, priority:260
msgid "--single-worktree"
msgstr "--single-worktree"
@@ -41399,7 +41528,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41422,7 +41551,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41440,7 +41569,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41548,13 +41677,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41572,7 +41701,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41680,7 +41809,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41692,7 +41821,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter `remote.<name>.skipDefaultUpdate` set to true will be updated. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -43752,65 +43881,7 @@ msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-list.txt:21
-#, priority:100
-msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s) given with a '{caret}' in front of them. The output is given in reverse chronological order by default."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:28
-#, priority:100
-msgid "You can think of this as a set operation. Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:30
-#, priority:100
-msgid "Thus, the following command:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:33
-#, no-wrap, priority:100
-msgid "\t$ git rev-list foo bar ^baz\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:37
-#, priority:100
-msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:41
-#, priority:100
-msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:45
-#, no-wrap, priority:100
-msgid ""
-"\t$ git rev-list origin..HEAD\n"
-"\t$ git rev-list HEAD ^origin\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:50
-#, ignore-ellipsis, priority:100
-msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rev-list.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"\t$ git rev-list A B --not $(git merge-base --all A B)\n"
-"\t$ git rev-list A...B\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-rev-list.txt:61
+#: en/git-rev-list.txt:25
#, priority:100
msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
msgstr ""
@@ -44156,19 +44227,19 @@ msgid "Show all refs matching the shell glob pattern `pattern`. If the pattern d
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:182 en/rev-list-options.txt:166
+#: en/git-rev-parse.txt:182 en/rev-list-options.txt:165
#, no-wrap, priority:260
msgid "--exclude=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
+#: en/git-rev-parse.txt:189 en/rev-list-options.txt:173
#, priority:260
msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:195 en/rev-list-options.txt:180
+#: en/git-rev-parse.txt:195 en/rev-list-options.txt:179
#, priority:260
msgid "The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly."
msgstr ""
@@ -46451,49 +46522,98 @@ msgid "Each pretty-printed commit will be rewrapped before it is shown."
msgstr ""
#. type: Labeled list
-#: en/git-shortlog.txt:51
+#: en/git-shortlog.txt:50
+#, fuzzy, no-wrap, priority:260
+#| msgid "--no-type"
+msgid "--group=<type>"
+msgstr "--no-type"
+
+#. type: Plain text
+#: en/git-shortlog.txt:53
+#, priority:260
+msgid "Group commits based on `<type>`. If no `--group` option is specified, the default is `author`. `<type>` is one of:"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:56
+#, priority:260
+msgid "`author`, commits are grouped by author"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:57
+#, priority:260
+msgid "`committer`, commits are grouped by committer (the same as `-c`)"
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:62
+#, priority:260
+msgid "`trailer:<field>`, the `<field>` is interpreted as a case-insensitive commit message trailer (see linkgit:git-interpret-trailers[1]). For example, if your project uses `Reviewed-by` trailers, you might want to see who has been reviewing with `git shortlog -ns --group=trailer:reviewed-by`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:67
+#, priority:260
+msgid "Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit)."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:72
+#, priority:260
+msgid "Shortlog will attempt to parse each trailer value as a `name <email>` identity. If successful, the mailmap is applied and the email is omitted unless the `--email` option is specified. If the value cannot be parsed as an identity, it will be taken literally and completely."
+msgstr ""
+
+#. type: Plain text
+#: en/git-shortlog.txt:78
+#, priority:260
+msgid "If `--group` is specified multiple times, commits are counted under each value (but again, only once per unique value in that commit). For example, `git shortlog --group=author --group=trailer:co-authored-by` counts both authors and co-authors."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-shortlog.txt:80
#, ignore-same, no-wrap, priority:260
msgid "--committer"
msgstr "--committer"
#. type: Plain text
-#: en/git-shortlog.txt:53
+#: en/git-shortlog.txt:82
#, priority:260
-msgid "Collect and show committer identities instead of authors."
+msgid "This is an alias for `--group=committer`."
msgstr ""
#. type: Labeled list
-#: en/git-shortlog.txt:54
+#: en/git-shortlog.txt:83
#, no-wrap, priority:260
msgid "-w[<width>[,<indent1>[,<indent2>]]]"
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:59
+#: en/git-shortlog.txt:88
#, priority:260
msgid "Linewrap the output by wrapping each line at `width`. The first line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:62
+#: en/git-shortlog.txt:91
#, priority:260
msgid "If width is `0` (zero) then indent the lines of the output without wrapping them."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:71
+#: en/git-shortlog.txt:100
#, 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: Plain text
-#: en/git-shortlog.txt:75
+#: en/git-shortlog.txt:104
#, priority:260
msgid "Consider only commits that are enough to explain how the files that match the specified paths came to be."
msgstr ""
#. type: Plain text
-#: en/git-shortlog.txt:88
+#: en/git-shortlog.txt:117
#, priority:260
msgid "The `.mailmap` feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently."
msgstr ""
@@ -46589,7 +46709,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:790
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46601,7 +46721,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:782
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -47227,6 +47347,12 @@ msgstr ""
msgid "The names of objects to show (defaults to 'HEAD'). For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
+#. type: Title -
+#: en/git-show.txt:49
+#, no-wrap, priority:260
+msgid "COMMON DIFF OPTIONS"
+msgstr ""
+
#. type: Labeled list
#: en/git-show.txt:60
#, no-wrap, priority:260
@@ -48939,16 +49065,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -48963,28 +49083,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -48999,20 +49107,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -50029,7 +50127,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1048
+#: en/git-svn.txt:346 en/rev-list-options.txt:1047
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -51762,7 +51860,7 @@ msgid ""
"'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
"\t[--points-at <object>] [--column[=<options>] | --no-column]\n"
"\t[--create-reflog] [--sort=<key>] [--format=<format>]\n"
-"\t[--[no-]merged [<commit>]] [<pattern>...]\n"
+"\t[--merged <commit>] [--no-merged <commit>] [<pattern>...]\n"
"'git tag' -v [--format=<format>] <tagname>...\n"
msgstr ""
@@ -51955,13 +52053,13 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:153
#, priority:240
-msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
+msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified)."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:157
#, priority:240
-msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
+msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified)."
msgstr ""
#. type: Plain text
@@ -52019,7 +52117,7 @@ msgid "The name of the tag to create, delete, or describe. The new tag name mus
msgstr ""
#. type: Labeled list
-#: en/git-tag.txt:209 en/git.txt:348
+#: en/git-tag.txt:209 en/git.txt:355
#, no-wrap, priority:240
msgid "<commit>"
msgstr ""
@@ -52261,7 +52359,7 @@ msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
msgstr ""
#. type: Plain text
-#: en/git-tag.txt:384
+#: en/git-tag.txt:389
#, priority:240
msgid "linkgit:git-check-ref-format[1]. linkgit:git-config[1]."
msgstr ""
@@ -52761,19 +52859,32 @@ msgid "These are internal helper commands used by other commands; end users typi
msgstr ""
#. type: Title -
-#: en/git.txt:309
+#: en/git.txt:308
+#, fuzzy, no-wrap, priority:100
+#| msgid "--guides"
+msgid "Guides"
+msgstr "--guides"
+
+#. type: Plain text
+#: en/git.txt:311
+#, priority:100
+msgid "The following documentation pages are guides about Git concepts."
+msgstr ""
+
+#. type: Title -
+#: en/git.txt:316
#, no-wrap, priority:100
msgid "Configuration Mechanism"
msgstr ""
#. type: Plain text
-#: en/git.txt:314
+#: en/git.txt:321
#, priority:100
msgid "Git uses a simple text format to store customizations that are per repository and are per user. Such a configuration file may look like this:"
msgstr ""
#. type: delimited block -
-#: en/git.txt:319
+#: en/git.txt:326
#, no-wrap, priority:100
msgid ""
"#\n"
@@ -52782,7 +52893,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git.txt:329
+#: en/git.txt:336
#, no-wrap, priority:100
msgid ""
"; user identity\n"
@@ -52792,661 +52903,667 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git.txt:335
+#: en/git.txt:342
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
#. type: Title -
-#: en/git.txt:338
+#: en/git.txt:345
#, no-wrap, priority:100
msgid "Identifier Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:341
+#: en/git.txt:348
#, priority:100
msgid "Indicates the object name for any type of object."
msgstr ""
#. type: Labeled list
-#: en/git.txt:342 en/git-unpack-file.txt:23
+#: en/git.txt:349 en/git-unpack-file.txt:23
#, no-wrap, priority:100
msgid "<blob>"
msgstr ""
#. type: Plain text
-#: en/git.txt:344
+#: en/git.txt:351
#, priority:100
msgid "Indicates a blob object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:347
+#: en/git.txt:354
#, priority:100
msgid "Indicates a tree object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:350
+#: en/git.txt:357
#, priority:100
msgid "Indicates a commit object name."
msgstr ""
#. type: Plain text
-#: en/git.txt:356
+#: en/git.txt:363
#, priority:100
msgid "Indicates a tree, commit or tag object name. A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
-#: en/git.txt:357
+#: en/git.txt:364
#, no-wrap, priority:100
msgid "<commit-ish>"
msgstr ""
#. type: Plain text
-#: en/git.txt:362
+#: en/git.txt:369
#, priority:100
msgid "Indicates a commit or tag object name. A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
msgstr ""
#. type: Plain text
-#: en/git.txt:366
+#: en/git.txt:373
#, priority:100
msgid "Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`."
msgstr ""
#. type: Plain text
-#: en/git.txt:370
+#: en/git.txt:377
#, priority:100
msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
msgstr ""
#. type: Title -
-#: en/git.txt:372
+#: en/git.txt:379
#, no-wrap, priority:100
msgid "Symbolic Identifiers"
msgstr ""
#. type: Plain text
-#: en/git.txt:375
+#: en/git.txt:382
#, priority:100
msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
msgstr ""
#. type: Plain text
-#: en/git.txt:378
+#: en/git.txt:385
#, priority:100
msgid "indicates the head of the current branch."
msgstr ""
#. type: Labeled list
-#: en/git.txt:379
+#: en/git.txt:386
#, no-wrap, priority:100
msgid "<tag>"
msgstr ""
#. type: Plain text
-#: en/git.txt:382
+#: en/git.txt:389
#, priority:100
msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:386
+#: en/git.txt:393
#, priority:100
msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
msgstr ""
#. type: Plain text
-#: en/git.txt:389
+#: en/git.txt:396
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:392
+#: en/git.txt:399
#, no-wrap, priority:100
msgid "File/Directory Structure"
msgstr ""
#. type: Plain text
-#: en/git.txt:395
+#: en/git.txt:402
#, priority:100
msgid "Please see the linkgit:gitrepository-layout[5] document."
msgstr ""
#. type: Plain text
-#: en/git.txt:397
+#: en/git.txt:404
#, priority:100
msgid "Read linkgit:githooks[5] for more details about each hook."
msgstr ""
#. type: Plain text
-#: en/git.txt:400
+#: en/git.txt:407
#, priority:100
msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
msgstr ""
#. type: Title -
-#: en/git.txt:403
+#: en/git.txt:410
#, no-wrap, priority:100
msgid "Terminology"
msgstr ""
#. type: Plain text
-#: en/git.txt:405
+#: en/git.txt:412
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:410
+#: en/git.txt:417
#, priority:100
msgid "Various Git commands use the following environment variables:"
msgstr ""
#. type: Title ~
-#: en/git.txt:412
+#: en/git.txt:419
#, no-wrap, priority:100
msgid "The Git Repository"
msgstr ""
#. type: Plain text
-#: en/git.txt:416
+#: en/git.txt:423
#, priority:100
msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
msgstr ""
#. type: Labeled list
-#: en/git.txt:417
+#: en/git.txt:424
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
-#: en/git.txt:421
+#: en/git.txt:428
#, priority:100
msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:422
+#: en/git.txt:429
#, ignore-same, no-wrap, priority:100
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
#. type: Plain text
-#: en/git.txt:427
+#: en/git.txt:434
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
#. type: Labeled list
-#: en/git.txt:428
+#: en/git.txt:435
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
#. type: Plain text
-#: en/git.txt:433
+#: en/git.txt:440
#, priority:100
msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
-#: en/git.txt:434
+#: en/git.txt:441
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:440
+#: en/git.txt:447
#, priority:100
msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
-#: en/git.txt:446
+#: en/git.txt:453
#, priority:100
msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:447
+#: en/git.txt:454
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
-#: en/git.txt:452
+#: en/git.txt:459
#, priority:100
msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:453
+#: en/git.txt:460
#, ignore-same, no-wrap, priority:100
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
#. type: Plain text
-#: en/git.txt:457
+#: en/git.txt:464
#, priority:100
msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
msgstr ""
#. type: Labeled list
-#: en/git.txt:458
+#: en/git.txt:465
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
-#: en/git.txt:461
+#: en/git.txt:468
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
-#: en/git.txt:462
+#: en/git.txt:469
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
#. type: Plain text
-#: en/git.txt:476
+#: en/git.txt:483
#, priority:100
msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:477
+#: en/git.txt:484
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#. type: Plain text
-#: en/git.txt:486
+#: en/git.txt:493
#, priority:100
msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:487
+#: en/git.txt:494
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
#. type: Plain text
-#: en/git.txt:495
+#: en/git.txt:502
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
#. type: Labeled list
-#: en/git.txt:496
+#: en/git.txt:503
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DEFAULT_HASH`"
msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
-#: en/git.txt:501
+#: en/git.txt:509
#, priority:100
-msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\"."
+msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]."
msgstr ""
#. type: Title ~
-#: en/git.txt:503
+#: en/git.txt:511
#, no-wrap, priority:100
msgid "Git Commits"
msgstr ""
#. type: Labeled list
-#: en/git.txt:504
+#: en/git.txt:512
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Plain text
-#: en/git.txt:508
+#: en/git.txt:516
#, priority:100
msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:509
+#: en/git.txt:517
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Plain text
-#: en/git.txt:513
+#: en/git.txt:521
#, priority:100
msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:514
+#: en/git.txt:522
#, ignore-same, no-wrap, priority:100
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Plain text
-#: en/git.txt:517
+#: en/git.txt:525
#, priority:100
msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
#. type: Labeled list
-#: en/git.txt:518
+#: en/git.txt:526
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Plain text
-#: en/git.txt:522
+#: en/git.txt:530
#, priority:100
msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:523
+#: en/git.txt:531
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Plain text
-#: en/git.txt:527
+#: en/git.txt:535
#, priority:100
msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
msgstr ""
#. type: Labeled list
-#: en/git.txt:528
+#: en/git.txt:536
#, ignore-same, no-wrap, priority:100
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
#. type: Plain text
-#: en/git.txt:531
+#: en/git.txt:539
#, priority:100
msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
#. type: Labeled list
-#: en/git.txt:532
+#: en/git.txt:540
#, ignore-same, no-wrap, priority:100
msgid "`EMAIL`"
msgstr "`EMAIL`"
#. type: Plain text
-#: en/git.txt:535
+#: en/git.txt:543
#, priority:100
msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
msgstr ""
#. type: Title ~
-#: en/git.txt:537
+#: en/git.txt:545
#, no-wrap, priority:100
msgid "Git Diffs"
msgstr ""
#. type: Labeled list
-#: en/git.txt:538
+#: en/git.txt:546
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
#. type: Plain text
-#: en/git.txt:543
+#: en/git.txt:551
#, priority:100
msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
msgstr ""
#. type: Labeled list
-#: en/git.txt:544
+#: en/git.txt:552
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
#. type: Plain text
-#: en/git.txt:549
+#: en/git.txt:558
#, priority:100
-msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
+msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called to generate diffs, and Git does not use its builtin diff machinery. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
msgstr ""
#. type: Plain text
-#: en/git.txt:551
+#: en/git.txt:560
#, priority:100
msgid "path old-file old-hex old-mode new-file new-hex new-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:553
+#: en/git.txt:562
#, priority:100
msgid "where:"
msgstr ""
#. type: Labeled list
-#: en/git.txt:554
+#: en/git.txt:563
#, no-wrap, priority:100
msgid "<old|new>-file"
msgstr ""
#. type: Plain text
-#: en/git.txt:555
+#: en/git.txt:565
#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
-#. type: Plain text
-#: en/git.txt:556
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:556
+#: en/git.txt:565
#, no-wrap, priority:100
msgid "<old|new>-hex"
msgstr ""
#. type: Plain text
-#: en/git.txt:557
+#: en/git.txt:566
#, priority:100
msgid "are the 40-hexdigit SHA-1 hashes,"
msgstr ""
#. type: Labeled list
-#: en/git.txt:557
+#: en/git.txt:566
#, no-wrap, priority:100
msgid "<old|new>-mode"
msgstr ""
#. type: Plain text
-#: en/git.txt:558
+#: en/git.txt:567
#, priority:100
msgid "are the octal representation of the file modes."
msgstr ""
#. type: Plain text
-#: en/git.txt:564
+#: en/git.txt:573
#, priority:100
msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
-#: en/git.txt:567
+#: en/git.txt:576
#, priority:100
msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
msgstr ""
#. type: Plain text
-#: en/git.txt:570
+#: en/git.txt:579
#, priority:100
msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
msgstr ""
#. type: Labeled list
-#: en/git.txt:571
+#: en/git.txt:580
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
#. type: Plain text
-#: en/git.txt:573
+#: en/git.txt:582
#, priority:100
msgid "A 1-based counter incremented by one for every path."
msgstr ""
#. type: Labeled list
-#: en/git.txt:574
+#: en/git.txt:583
#, ignore-same, no-wrap, priority:100
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
#. type: Plain text
-#: en/git.txt:576
+#: en/git.txt:585
#, priority:100
msgid "The total number of paths."
msgstr ""
#. type: Labeled list
-#: en/git.txt:579
+#: en/git.txt:588
#, ignore-same, no-wrap, priority:100
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
#. type: Plain text
-#: en/git.txt:583
+#: en/git.txt:592
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
#. type: Labeled list
-#: en/git.txt:584
+#: en/git.txt:593
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
#. type: Plain text
-#: en/git.txt:589
+#: en/git.txt:598
#, priority:100
msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:590
+#: en/git.txt:599
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROGRESS_DELAY`"
msgstr "`GIT_PROGRESS_DELAY`"
#. type: Plain text
-#: en/git.txt:593
+#: en/git.txt:602
#, priority:100
msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
msgstr ""
#. type: Labeled list
-#: en/git.txt:594
+#: en/git.txt:603
#, ignore-same, no-wrap, priority:100
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
#. type: Plain text
-#: en/git.txt:599
+#: en/git.txt:608
#, priority:100
msgid "This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:600
+#: en/git.txt:609
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_SEQUENCE_EDITOR`"
+msgstr "`GIT_SEQUENCE_EDITOR`"
+
+#. type: Plain text
+#: en/git.txt:614
+#, priority:100
+msgid "This environment variable overrides the configured Git editor when editing the todo list of an interactive rebase. See also linkit::git-rebase[1] and the `sequence.editor` option in linkit::git-config[1]."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:615
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
-#: en/git.txt:601
+#: en/git.txt:616
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
#. type: Plain text
-#: en/git.txt:608
+#: en/git.txt:623
#, priority:100
msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system. The command-line parameters passed to the configured command are determined by the ssh variant. See `ssh.variant` option in linkgit:git-config[1] for details."
msgstr ""
#. type: Plain text
-#: en/git.txt:614
+#: en/git.txt:629
#, priority:100
msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included. `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
msgstr ""
#. type: Plain text
-#: en/git.txt:618
+#: en/git.txt:633
#, priority:100
msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file. Please consult your ssh documentation for further details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:619
+#: en/git.txt:634
#, ignore-same, no-wrap, priority:100
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
#. type: Plain text
-#: en/git.txt:624
+#: en/git.txt:639
#, priority:100
msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
-#: en/git.txt:625
+#: en/git.txt:640
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
-#: en/git.txt:631
+#: en/git.txt:646
#, priority:100
msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
msgstr ""
#. type: Labeled list
-#: en/git.txt:632
+#: en/git.txt:647
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
#. type: Plain text
-#: en/git.txt:635
+#: en/git.txt:650
#, priority:100
msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:636
+#: en/git.txt:651
#, ignore-same, no-wrap, priority:100
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
-#: en/git.txt:643
+#: en/git.txt:658
#, priority:100
msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
msgstr ""
#. type: Labeled list
-#: en/git.txt:644
+#: en/git.txt:659
#, ignore-same, no-wrap, priority:100
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
#. type: Plain text
-#: en/git.txt:654
+#: en/git.txt:669
#, no-wrap, priority:100
msgid ""
"If this environment variable is set to \"1\", then commands such\n"
@@ -53461,523 +53578,535 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git.txt:655
+#: en/git.txt:670
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
#. type: Plain text
-#: en/git.txt:658
+#: en/git.txt:673
#, priority:100
msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
msgstr ""
#. type: Plain text
-#: en/git.txt:662 en/git.txt:738
+#: en/git.txt:677 en/git.txt:757
#, priority:100
msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
msgstr ""
#. type: Plain text
-#: en/git.txt:667 en/git.txt:743
+#: en/git.txt:682 en/git.txt:762
#, priority:100
msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
-#: en/git.txt:672
+#: en/git.txt:687
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
msgstr ""
#. type: Plain text
-#: en/git.txt:675 en/git.txt:760
+#: en/git.txt:690 en/git.txt:779
#, priority:100
msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
msgstr ""
#. type: Labeled list
-#: en/git.txt:676
+#: en/git.txt:691
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
#. type: Plain text
-#: en/git.txt:679
+#: en/git.txt:694
#, priority:100
msgid "Enables trace messages for the filesystem monitor extension. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:680
+#: en/git.txt:695
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
#. type: Plain text
-#: en/git.txt:686
+#: en/git.txt:701
#, priority:100
msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:687
+#: en/git.txt:702
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
#. type: Plain text
-#: en/git.txt:693
+#: en/git.txt:708
#, priority:100
msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below). See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:694
+#: en/git.txt:709
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
#. type: Plain text
-#: en/git.txt:701
+#: en/git.txt:716
#, priority:100
msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
msgstr ""
#. type: Plain text
-#: en/git.txt:704
+#: en/git.txt:719
#, priority:100
msgid "Note that this is currently only implemented for the client side of clones and fetches."
msgstr ""
#. type: Labeled list
-#: en/git.txt:705
+#: en/git.txt:720
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
#. type: Plain text
-#: en/git.txt:709
+#: en/git.txt:724
#, priority:100
msgid "Enables performance related trace messages, e.g. total execution time of each Git command. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:710
+#: en/git.txt:725
+#, ignore-same, no-wrap, priority:100
+msgid "`GIT_TRACE_REFS`"
+msgstr "`GIT_TRACE_REFS`"
+
+#. type: Plain text
+#: en/git.txt:728
+#, priority:100
+msgid "Enables trace messages for operations on the ref database. See `GIT_TRACE` for available trace output options."
+msgstr ""
+
+#. type: Labeled list
+#: en/git.txt:729
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
#. type: Plain text
-#: en/git.txt:714
+#: en/git.txt:733
#, priority:100
msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:715
+#: en/git.txt:734
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
-#: en/git.txt:719
+#: en/git.txt:738
#, priority:100
msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:720
+#: en/git.txt:739
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
#. type: Plain text
-#: en/git.txt:725
+#: en/git.txt:744
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
-#: en/git.txt:726
+#: en/git.txt:745
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
#. type: Plain text
-#: en/git.txt:729
+#: en/git.txt:748
#, priority:100
msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:730
+#: en/git.txt:749
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2`"
msgstr "`GIT_TRACE2`"
#. type: Plain text
-#: en/git.txt:734
+#: en/git.txt:753
#, priority:100
msgid "Enables more detailed trace messages from the \"trace2\" library. Output from `GIT_TRACE2` is a simple text-based format for human readability."
msgstr ""
#. type: Plain text
-#: en/git.txt:752
+#: en/git.txt:771
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
#. type: Plain text
-#: en/git.txt:757
+#: en/git.txt:776
#, priority:100
msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`."
msgstr ""
#. type: Plain text
-#: en/git.txt:763
+#: en/git.txt:782
#, priority:100
msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:765
+#: en/git.txt:784
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_EVENT`"
msgstr "`GIT_TRACE2_EVENT`"
#. type: Plain text
-#: en/git.txt:770
+#: en/git.txt:789
#, priority:100
msgid "This setting writes a JSON-based format that is suited for machine interpretation. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:771
+#: en/git.txt:790
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE2_PERF`"
msgstr "`GIT_TRACE2_PERF`"
#. type: Plain text
-#: en/git.txt:777
+#: en/git.txt:796
#, priority:100
msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions. See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:778
+#: en/git.txt:797
#, ignore-same, no-wrap, priority:100
msgid "`GIT_TRACE_REDACT`"
msgstr "`GIT_TRACE_REDACT`"
#. type: Plain text
-#: en/git.txt:782
+#: en/git.txt:801
#, priority:100
msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
msgstr ""
#. type: Labeled list
-#: en/git.txt:783
+#: en/git.txt:802
#, ignore-same, no-wrap, priority:100
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:791
+#: en/git.txt:810
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:792
+#: en/git.txt:811
#, ignore-same, no-wrap, priority:100
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:795
+#: en/git.txt:814
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:796
+#: en/git.txt:815
#, ignore-same, no-wrap, priority:100
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:799
+#: en/git.txt:818
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:800
+#: en/git.txt:819
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
#. type: Plain text
-#: en/git.txt:803
+#: en/git.txt:822
#, priority:100
msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
msgstr ""
#. type: Labeled list
-#: en/git.txt:804
+#: en/git.txt:823
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
#. type: Plain text
-#: en/git.txt:813
+#: en/git.txt:832
#, priority:100
msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref. A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
msgstr ""
#. type: Labeled list
-#: en/git.txt:814
+#: en/git.txt:833
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
#. type: Plain text
-#: en/git.txt:824
+#: en/git.txt:843
#, priority:100
msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
msgstr ""
#. type: Labeled list
-#: en/git.txt:825
+#: en/git.txt:844
#, ignore-same, no-wrap, priority:100
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:833
+#: en/git.txt:852
#, priority:100
msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:834
+#: en/git.txt:853
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
-#: en/git.txt:840
+#: en/git.txt:859
#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
-#: en/git.txt:841
+#: en/git.txt:860
#, ignore-same, no-wrap, priority:100
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
#. type: Plain text
-#: en/git.txt:846
+#: en/git.txt:865
#, priority:100
msgid "For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values 'key[=value]'. Presence of unknown keys and values must be ignored."
msgstr ""
#. type: Labeled list
-#: en/git.txt:847
+#: en/git.txt:866
#, ignore-same, no-wrap, priority:100
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
#. type: Plain text
-#: en/git.txt:854
+#: en/git.txt:873
#, priority:100
msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock. For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
-#: en/git.txt:855
+#: en/git.txt:874
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
-#: en/git.txt:856
+#: en/git.txt:875
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
-#: en/git.txt:857
+#: en/git.txt:876
#, ignore-same, no-wrap, priority:100
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
#. type: Plain text
-#: en/git.txt:867
+#: en/git.txt:886
#, priority:100
msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
-#: en/git.txt:872
+#: en/git.txt:891
#, priority:100
msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
-#: en/git.txt:873
+#: en/git.txt:892
#, no-wrap, priority:100
msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
msgstr ""
#. type: Plain text
-#: en/git.txt:881
+#: en/git.txt:900
#, priority:100
msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
msgstr ""
#. type: Title -
-#: en/git.txt:883
+#: en/git.txt:902
#, no-wrap, priority:100
msgid "Discussion[[Discussion]]"
msgstr ""
#. type: Plain text
-#: en/git.txt:888
+#: en/git.txt:907
#, priority:100
msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
msgstr ""
#. type: Plain text
-#: en/git.txt:895
+#: en/git.txt:914
#, priority:100
msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
msgstr ""
#. type: Plain text
-#: en/git.txt:900
+#: en/git.txt:919
#, priority:100
msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
msgstr ""
#. type: Plain text
-#: en/git.txt:905
+#: en/git.txt:924
#, priority:100
msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development."
msgstr ""
#. type: Plain text
-#: en/git.txt:911
+#: en/git.txt:930
#, priority:100
msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this purpose."
msgstr ""
#. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:933
#, priority:100
msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
msgstr ""
#. type: Plain text
-#: en/git.txt:921
+#: en/git.txt:940
#, priority:100
msgid "Named pointers called refs mark interesting points in history. A ref may contain the SHA-1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch."
msgstr ""
#. type: Plain text
-#: en/git.txt:930
+#: en/git.txt:949
#, priority:100
msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes. The blob object represents the contents of the file as of the head of the current branch. The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree. Subsequent changes to the working tree can be found by comparing these attributes. The index may be updated with new content, and new commits may be created from the content stored in the index."
msgstr ""
#. type: Plain text
-#: en/git.txt:934
+#: en/git.txt:953
#, priority:100
msgid "The index is also capable of storing multiple entries (called \"stages\") for a given pathname. These stages are used to hold the various unmerged version of a file when a merge is in progress."
msgstr ""
#. type: Title -
-#: en/git.txt:936
+#: en/git.txt:955
#, no-wrap, priority:100
msgid "FURTHER DOCUMENTATION"
msgstr ""
#. type: Plain text
-#: en/git.txt:941
+#: en/git.txt:960
#, priority:100
msgid "See the references in the \"description\" section to get started using Git. The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
-#: en/git.txt:945
+#: en/git.txt:964
#, priority:100
msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
msgstr ""
#. type: Plain text
-#: en/git.txt:947
+#: en/git.txt:966
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
#. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:969
#, priority:100
msgid "See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:972
#, priority:100
msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
msgstr ""
#. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:975
#, priority:100
msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
msgstr ""
#. type: Title -
-#: en/git.txt:959
+#: en/git.txt:978
#, no-wrap, priority:100
msgid "Authors"
msgstr ""
#. type: Plain text
-#: en/git.txt:964
+#: en/git.txt:983
#, priority:100
msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
msgstr ""
#. type: Plain text
-#: en/git.txt:968
+#: en/git.txt:987
#, priority:100
msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
msgstr ""
#. type: Title -
-#: en/git.txt:970
+#: en/git.txt:989
#, no-wrap, priority:100
msgid "Reporting Bugs"
msgstr ""
#. type: Plain text
-#: en/git.txt:977
+#: en/git.txt:996
#, priority:100
msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
msgstr ""
#. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:999
#, priority:100
msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
msgstr ""
#. type: Plain text
-#: en/git.txt:988
+#: en/git.txt:1007
#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
msgstr ""
@@ -54051,16 +54180,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54159,16 +54282,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54183,22 +54300,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -55221,43 +55326,43 @@ msgid "LOGGING UPDATES"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:157
+#: en/git-update-ref.txt:158
#, priority:100
-msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
+msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or a pseudoref like HEAD or ORIG_HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:159
+#: en/git-update-ref.txt:160
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:164
+#: en/git-update-ref.txt:165
#, priority:100
msgid "Where \"oldsha1\" is the 40 character hexadecimal value previously stored in <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and \"committer\" is the committer's name, email address and date in the standard Git committer ident format."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:166
+#: en/git-update-ref.txt:167
#, priority:100
msgid "Optionally with -m:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:168
+#: en/git-update-ref.txt:169
#, no-wrap, priority:100
msgid " oldsha1 SP newsha1 SP committer TAB message LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:171
+#: en/git-update-ref.txt:172
#, priority:100
msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:175
+#: en/git-update-ref.txt:176
#, priority:100
msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
msgstr ""
@@ -56099,8 +56204,8 @@ msgid "git-worktree - Manage multiple working trees"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:19
-#, no-wrap, priority:240
+#: 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 list' [--porcelain]\n"
@@ -56108,413 +56213,450 @@ msgid ""
"'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"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:24
+#: en/git-worktree.txt:25
#, priority:240
msgid "Manage multiple working trees attached to the same repository."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:32
+#: en/git-worktree.txt:34
+#, priority:240
+msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1]. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:46
#, priority:240
-msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\". A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
+msgid "In its simplest form, `git worktree add <path>` automatically creates a new branch whose name is the final component of `<path>`, which is convenient if you plan to work on a new topic. For instance, `git worktree add ../hotfix` creates new branch `hotfix` and checks it out at path `../hotfix`. To instead work on an existing branch in a new working tree, use `git worktree add <path> <branch>`. On the other hand, if you just plan to make some experimental changes or do testing without disturbing existing development, it is often convenient to create a 'throwaway' working tree not associated with any branch. For instance, `git worktree add -d <path>` creates a new working tree with a detached `HEAD` at the same commit as the current branch."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:39
+#: en/git-worktree.txt:53
#, priority:240
msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:44
+#: en/git-worktree.txt:58
#, priority:240
msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:47
+#: en/git-worktree.txt:61
#, no-wrap, priority:240
msgid "add <path> [<commit-ish>]"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:53
+#: en/git-worktree.txt:67
#, priority:240
-msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<commit-ish>`; it is synonymous with `@{-1}`."
+msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may be a bare \"`-`\", which is synonymous with `@{-1}`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:58
+#: en/git-worktree.txt:72
#, priority:240
-msgid "If <commit-ish> is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
+msgid "If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:61
+#: en/git-worktree.txt:75
#, no-wrap, priority:240
msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:80
+#: en/git-worktree.txt:85
+#, priority:240
+msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the `origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:94
#, priority:240
-msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on HEAD is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
+msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new working tree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new working tree, if it's not checked out anywhere else, otherwise the command will refuse to create the working tree (unless `--force` is used)."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:87
+#: en/git-worktree.txt:101
#, priority:240
-msgid "List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
+msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, and the branch currently checked out (or \"detached HEAD\" if none)."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:88
+#: en/git-worktree.txt:102
#, ignore-same, no-wrap, priority:240
msgid "lock"
msgstr "lock"
#. type: Plain text
-#: en/git-worktree.txt:95
+#: en/git-worktree.txt:109
#, priority:240
msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:96
+#: en/git-worktree.txt:110
#, ignore-same, no-wrap, priority:240
msgid "move"
msgstr "move"
#. type: Plain text
-#: en/git-worktree.txt:100
+#: en/git-worktree.txt:117
#, priority:240
-msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved."
+msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked working trees if you move the main working tree manually.)"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:104
+#: en/git-worktree.txt:121
#, priority:240
-msgid "Prune working tree information in $GIT_DIR/worktrees."
+msgid "Prune working tree information in `$GIT_DIR/worktrees`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:111
+#: en/git-worktree.txt:128
#, priority:240
msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:112
+#: en/git-worktree.txt:129
+#, ignore-ellipsis, no-wrap, priority:240
+msgid "repair [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:133
+#, priority:240
+msgid "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:138
+#, priority:240
+msgid "For instance, if the main working tree (or bare repository) is moved, linked working trees will be unable to locate it. Running `repair` in the main working tree will reestablish the connection from linked working trees back to the main working tree."
+msgstr ""
+
+#. type: Plain text
+#: en/git-worktree.txt:145
+#, priority:240
+msgid "Similarly, if a linked working tree is moved without using `git worktree move`, the main working tree (or bare repository) will be unable to locate it. Running `repair` within the recently-moved working tree will reestablish the connection. If multiple linked working trees are moved, running `repair` from any working tree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-worktree.txt:146
#, ignore-same, no-wrap, priority:240
msgid "unlock"
msgstr "unlock"
#. type: Plain text
-#: en/git-worktree.txt:115
+#: en/git-worktree.txt:149
#, priority:240
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:127
+#: en/git-worktree.txt:161
#, priority:240
msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:132
+#: en/git-worktree.txt:166
#, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:169
#, priority:240
msgid "`remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:136
+#: en/git-worktree.txt:170
#, no-wrap, priority:240
msgid "-b <new-branch>"
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:137
+#: en/git-worktree.txt:171
#, no-wrap, priority:240
msgid "-B <new-branch>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:144
+#: en/git-worktree.txt:178
#, priority:240
-msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
+msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:148
+#: en/git-worktree.txt:183
#, priority:240
-msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
+msgid "With `add`, detach `HEAD` in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:149
+#: en/git-worktree.txt:184
#, ignore-same, no-wrap, priority:240
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
-#: en/git-worktree.txt:154
+#: en/git-worktree.txt:189
#, priority:240
msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:155
+#: en/git-worktree.txt:190
#, ignore-same, no-wrap, priority:240
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
#. type: Plain text
-#: en/git-worktree.txt:161
+#: en/git-worktree.txt:196
#, priority:240
-msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
+msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:164
+#: en/git-worktree.txt:199
#, priority:240
msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:165
+#: en/git-worktree.txt:200
#, ignore-same, no-wrap, priority:240
msgid "--[no-]track"
msgstr "--[no-]track"
#. type: Plain text
-#: en/git-worktree.txt:170
+#: en/git-worktree.txt:205
#, priority:240
-msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See \"--track\" in linkgit:git-branch[1] for details."
+msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:171
+#: en/git-worktree.txt:206
#, ignore-same, no-wrap, priority:240
msgid "--lock"
msgstr "--lock"
#. type: Plain text
-#: en/git-worktree.txt:175
+#: en/git-worktree.txt:210
#, priority:240
-msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
+msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:180
+#: en/git-worktree.txt:215
#, priority:240
msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:185
+#: en/git-worktree.txt:220
#, priority:240
msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:189
+#: en/git-worktree.txt:224
#, priority:240
-msgid "With 'add', suppress feedback messages."
+msgid "With `add`, suppress feedback messages."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:193
+#: en/git-worktree.txt:228
#, priority:240
msgid "With `prune`, report all removals."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:196
+#: en/git-worktree.txt:231
#, priority:240
-msgid "With `prune`, only expire unused working trees older than <time>."
+msgid "With `prune`, only expire unused working trees older than `<time>`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:232
#, no-wrap, priority:240
msgid "--reason <string>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:199
+#: en/git-worktree.txt:234
#, priority:240
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:200
+#: en/git-worktree.txt:235
#, no-wrap, priority:240
msgid "<worktree>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:203
+#: en/git-worktree.txt:238
#, priority:240
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:243
#, priority:240
-msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
+msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify a working tree. For example if you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former working tree."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:210
+#: en/git-worktree.txt:245
#, no-wrap, priority:240
msgid "REFS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:215
+#: en/git-worktree.txt:250
#, priority:240
-msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
+msgid "In multiple working trees, some refs may be shared between all working trees and some refs are local. One example is `HEAD` which is different for each working tree. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:221
+#: en/git-worktree.txt:256
#, priority:240
-msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
+msgid "In general, all pseudo refs are per working tree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:226
+#: en/git-worktree.txt:261
#, priority:240
-msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
+msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:233
+#: en/git-worktree.txt:268
#, priority:240
-msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
+msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main working tree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:237
+#: en/git-worktree.txt:272
#, priority:240
-msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
+msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:244
+#: en/git-worktree.txt:279
#, priority:240
-msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
+msgid "By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:247
+#: en/git-worktree.txt:282
#, priority:240
-msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
+msgid "In order to have configuration specific to working trees, you can turn on the `worktreeConfig` extension, e.g.:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:250
+#: en/git-worktree.txt:285
#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:256
+#: en/git-worktree.txt:291
#, priority:240
msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:297
#, priority:240
-msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
+msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:264
+#: en/git-worktree.txt:299
#, priority:240
msgid "`core.worktree` and `core.bare` should never be shared"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:302
#, priority:240
msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:269
+#: en/git-worktree.txt:304
#, no-wrap, priority:240
msgid "DETAILS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:278
+#: en/git-worktree.txt:313
#, priority:240
-msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
+msgid "Each linked working tree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:284
+#: en/git-worktree.txt:319
#, priority:240
-msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
+msgid "Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:294
+#: en/git-worktree.txt:329
#, priority:240
-msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
+msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except `refs/bisect` and `refs/worktree`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:299
+#: en/git-worktree.txt:334
#, priority:240
-msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
+msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:306
+#: en/git-worktree.txt:342
#, priority:240
-msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
+msgid "If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:317
+#: en/git-worktree.txt:353
#, priority:240
-msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
+msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:356
#, priority:240
-msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
+msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:322
+#: en/git-worktree.txt:358
#, no-wrap, priority:240
msgid "LIST OUTPUT FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:325
+#: en/git-worktree.txt:361
#, priority:240
-msgid "The worktree list command has two output formats. The default format shows the details on a single line with columns. For example:"
+msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:331
+#: en/git-worktree.txt:367
#, no-wrap, priority:240
msgid ""
"$ git worktree list\n"
@@ -56524,19 +56666,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-worktree.txt:334
+#: en/git-worktree.txt:370
#, no-wrap, priority:240
msgid "Porcelain Format"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:340
+#: en/git-worktree.txt:376
#, priority:240
-msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true. The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record. For example:"
+msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. The first attribute of a working tree is always `worktree`, an empty line indicates the end of the record. For example:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:345
+#: en/git-worktree.txt:381
#, no-wrap, priority:240
msgid ""
"$ git worktree list --porcelain\n"
@@ -56545,7 +56687,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:349
+#: en/git-worktree.txt:385
#, no-wrap, priority:240
msgid ""
"worktree /path/to/linked-worktree\n"
@@ -56554,7 +56696,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:353
+#: en/git-worktree.txt:389
#, no-wrap, priority:240
msgid ""
"worktree /path/to/other-linked-worktree\n"
@@ -56563,13 +56705,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:366
+#: en/git-worktree.txt:402
#, priority:240
msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:374
+#: en/git-worktree.txt:410
#, ignore-ellipsis, no-wrap, priority:240
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
@@ -56581,7 +56723,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:381
+#: en/git-worktree.txt:417
#, priority:240
msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
@@ -58716,60 +58858,81 @@ msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:18
+#, fuzzy, priority:240
+#| msgid "vimdiff"
+msgid "nvimdiff"
+msgstr "vimdiff"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:19
+#, fuzzy, priority:240
+#| msgid "vimdiff2"
+msgid "nvimdiff2"
+msgstr "vimdiff2"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:20
+#, fuzzy, priority:240
+#| msgid "vimdiff3"
+msgid "nvimdiff3"
+msgstr "vimdiff3"
+
+#. type: Plain text
+#: en/mergetools-merge.txt:21
#, ignore-same, priority:240
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
-#: en/mergetools-merge.txt:19
+#: en/mergetools-merge.txt:22
#, ignore-same, priority:240
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
-#: en/mergetools-merge.txt:20
+#: en/mergetools-merge.txt:23
#, ignore-same, priority:240
msgid "smerge"
msgstr "smerge"
#. type: Plain text
-#: en/mergetools-merge.txt:21
+#: en/mergetools-merge.txt:24
#, ignore-same, priority:240
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:22
+#: en/mergetools-merge.txt:25
#, ignore-same, priority:240
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
-#: en/mergetools-merge.txt:23
+#: en/mergetools-merge.txt:26
#, ignore-same, priority:240
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
-#: en/mergetools-merge.txt:24
+#: en/mergetools-merge.txt:27
#, ignore-same, priority:240
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
-#: en/mergetools-merge.txt:25
+#: en/mergetools-merge.txt:28
#, ignore-same, priority:240
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
-#: en/mergetools-merge.txt:26
+#: en/mergetools-merge.txt:29
#, ignore-same, priority:240
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
-#: en/mergetools-merge.txt:26
+#: en/mergetools-merge.txt:29
#, ignore-same, priority:240
msgid "xxdiff"
msgstr "xxdiff"
@@ -59069,16 +59232,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59100,33 +59257,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59135,16 +59280,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59153,16 +59292,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59171,16 +59304,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59189,16 +59316,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59298,15 +59419,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59328,9 +59443,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59352,15 +59467,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59466,9 +59575,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59490,9 +59599,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59514,9 +59623,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59627,16 +59736,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -59723,16 +59826,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -59777,16 +59874,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -59807,16 +59898,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -59825,16 +59910,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -59856,9 +59935,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59880,9 +59959,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59903,16 +59982,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -60066,7 +60139,7 @@ msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
#, priority:260
-msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
+msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit`, either explicit or implied by other options such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
@@ -60222,55 +60295,67 @@ msgid "The format of a <refspec> parameter is an optional plus `+`, followed by
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:35
+#: en/pull-fetch-param.txt:38
+#, priority:220
+msgid "A <refspec> may contain a `*` in its <src> to indicate a simple pattern match. Such a refspec functions like a glob that matches any ref with the same prefix. A pattern <refspec> must have a `*` in both the <src> and <dst>. It will map refs to the destination by replacing the `*` with the contents matched from the source."
+msgstr ""
+
+#. type: Plain text
+#: en/pull-fetch-param.txt:48
+#, priority:220
+msgid "If a refspec is prefixed by `^`, it will be interpreted as a negative refspec. Rather than specifying which refs to fetch or which local refs to update, such a refspec will instead specify refs to exclude. A ref will be considered to match if it matches at least one positive refspec, and does not match any negative refspec. Negative refspecs can be useful to restrict the scope of a pattern refspec so that it will not include specific refs. Negative refspecs can themselves be pattern refspecs. However, they may only contain a <src> and do not specify a <dst>. Fully spelled out hex object names are also not supported."
+msgstr ""
+
+#. type: Plain text
+#: en/pull-fetch-param.txt:51
#, priority:220
msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:39
+#: en/pull-fetch-param.txt:55
#, priority:220
msgid "The remote ref that matches <src> is fetched, and if <dst> is not an empty string, an attempt is made to update the local ref that matches it."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:46
+#: en/pull-fetch-param.txt:62
#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:54
+#: en/pull-fetch-param.txt:70
#, priority:220
msgid "Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`)."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:60
+#: en/pull-fetch-param.txt:76
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or a commit for another commit that's doesn't have the previous commit as an ancestor etc."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:64
+#: en/pull-fetch-param.txt:80
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], there is no configuration which'll amend these rules, and nothing like a `pre-fetch` hook analogous to the `pre-receive` hook."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:71
+#: en/pull-fetch-param.txt:87
#, priority:220
msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:83
+#: en/pull-fetch-param.txt:99
#, priority:220
msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
msgstr ""
#. type: Plain text
-#: en/pull-fetch-param.txt:103
+#: en/pull-fetch-param.txt:119
#, priority:220
msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
msgstr ""
@@ -60665,197 +60750,203 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:259
#, priority:100
+msgid "Specifying several revisions means the set of commits reachable from any of the given commits."
+msgstr ""
+
+#. type: Plain text
+#: en/revisions.txt:262
+#, priority:100
msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:262
+#: en/revisions.txt:265
#, no-wrap, priority:100
msgid "Commit Exclusions"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:264
+#: en/revisions.txt:267
#, no-wrap, priority:100
msgid "'{caret}<rev>' (caret) Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:269
+#: en/revisions.txt:272
#, 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:271
+#: en/revisions.txt:274
#, no-wrap, priority:100
msgid "Dotted Range Notations"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:273
+#: en/revisions.txt:276
#, no-wrap, priority:100
msgid "The '..' (two-dot) Range Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:279
+#: en/revisions.txt:282
#, 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:280
+#: en/revisions.txt:283
#, ignore-ellipsis, no-wrap, priority:100
msgid "The '...' (three-dot) Symmetric Difference Notation"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:286
+#: en/revisions.txt:289
#, 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:293
+#: en/revisions.txt:296
#, priority:100
msgid "In these two shorthand notations, you can omit one end and let it default to HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks \"What did I do since I forked from the origin branch?\" Similarly, '..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
-#: en/revisions.txt:295
+#: en/revisions.txt:298
#, no-wrap, priority:100
msgid "Other <rev>{caret} Parent Shorthand Notations"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:298
+#: en/revisions.txt:301
#, 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:300
+#: en/revisions.txt:303
#, priority:100
msgid "The 'r1{caret}@' notation means all parents of 'r1'."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:303
+#: en/revisions.txt:306
#, 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:310
+#: en/revisions.txt:313
#, 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:314
+#: en/revisions.txt:317
#, 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:316
+#: en/revisions.txt:319
#, no-wrap, priority:100
msgid "Revision Range Summary"
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:318
+#: en/revisions.txt:321
#, no-wrap, priority:100
msgid "'<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:321
+#: en/revisions.txt:324
#, priority:100
msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:322
+#: en/revisions.txt:325
#, no-wrap, priority:100
msgid "'{caret}<rev>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:325
+#: en/revisions.txt:328
#, priority:100
msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
-#: en/revisions.txt:326
+#: en/revisions.txt:329
#, no-wrap, priority:100
msgid "'<rev1>..<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:330
+#: en/revisions.txt:333
#, 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:331
+#: en/revisions.txt:334
#, ignore-ellipsis, no-wrap, priority:100
msgid "'<rev1>\\...<rev2>'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:335
+#: en/revisions.txt:338
#, 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:336
+#: en/revisions.txt:339
#, no-wrap, priority:100
msgid "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:340
+#: en/revisions.txt:343
#, 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:341
+#: en/revisions.txt:344
#, no-wrap, priority:100
msgid "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:345
+#: en/revisions.txt:348
#, 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:346
+#: en/revisions.txt:349
#, no-wrap, priority:100
msgid "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
msgstr ""
#. type: Plain text
-#: en/revisions.txt:349
+#: en/revisions.txt:352
#, priority:100
msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
msgstr ""
#. type: Plain text
-#: en/revisions.txt:353
+#: en/revisions.txt:356
#, 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:377
+#: en/revisions.txt:380
#, ignore-ellipsis, no-wrap, priority:100
msgid ""
" Args Expanded arguments Selected commits\n"
@@ -61171,445 +61262,445 @@ msgid "`--no-min-parents` and `--no-max-parents` reset these limits (to no limit
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:133
+#: en/rev-list-options.txt:132
#, priority:260
-msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
+msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:137
+#: en/rev-list-options.txt:136
#, priority:260
msgid "Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:141
+#: en/rev-list-options.txt:140
#, priority:260
msgid "Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the command line as '<commit>'."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:142
+#: en/rev-list-options.txt:141
#, no-wrap, priority:260
msgid "--branches[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:147
+#: en/rev-list-options.txt:146
#, priority:260
msgid "Pretend as if all the refs in `refs/heads` are listed on the command line as '<commit>'. If '<pattern>' is given, limit branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:148
+#: en/rev-list-options.txt:147
#, no-wrap, priority:260
msgid "--tags[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:153
+#: en/rev-list-options.txt:152
#, priority:260
msgid "Pretend as if all the refs in `refs/tags` are listed on the command line as '<commit>'. If '<pattern>' is given, limit tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:154
+#: en/rev-list-options.txt:153
#, no-wrap, priority:260
msgid "--remotes[=<pattern>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:159
+#: en/rev-list-options.txt:158
#, priority:260
msgid "Pretend as if all the refs in `refs/remotes` are listed on the command line as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:160
+#: en/rev-list-options.txt:159
#, no-wrap, priority:260
msgid "--glob=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:165
+#: en/rev-list-options.txt:164
#, priority:260
msgid "Pretend as if all the refs matching shell glob '<glob-pattern>' are listed on the command line as '<commit>'. Leading 'refs/', is automatically prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:181
+#: en/rev-list-options.txt:180
#, ignore-same, no-wrap, priority:260
msgid "--reflog"
msgstr "--reflog"
#. type: Plain text
-#: en/rev-list-options.txt:184
+#: en/rev-list-options.txt:183
#, priority:260
msgid "Pretend as if all objects mentioned by reflogs are listed on the command line as `<commit>`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:185
+#: en/rev-list-options.txt:184
#, ignore-same, no-wrap, priority:260
msgid "--alternate-refs"
msgstr "--alternate-refs"
#. type: Plain text
-#: en/rev-list-options.txt:192
+#: en/rev-list-options.txt:191
#, priority:260
msgid "Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in `objects/info/alternates`. The set of included objects may be modified by `core.alternateRefsCommand`, etc. See linkgit:git-config[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:200
+#: en/rev-list-options.txt:199
#, priority:260
msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`. This option forces them to examine the current working tree only."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:204
+#: en/rev-list-options.txt:203
#, priority:260
msgid "Upon seeing an invalid object name in the input, pretend as if the bad input was not given."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
+#: en/rev-list-options.txt:205 en/rev-list-options.txt:723
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
#. type: Plain text
-#: en/rev-list-options.txt:211
+#: en/rev-list-options.txt:210
#, priority:260
-msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line. Cannot be combined with --first-parent."
+msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:218
+#: en/rev-list-options.txt:217
#, priority:260
msgid "In addition to the '<commit>' listed on the command line, read them from the standard input. If a `--` separator is seen, stop reading commits and start reading paths to limit the result."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:226
+#: en/rev-list-options.txt:225
#, priority:260
msgid "Don't print anything to standard output. This form is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to `/dev/null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:228
+#: en/rev-list-options.txt:227
#, ignore-same, no-wrap, priority:260
msgid "--cherry-mark"
msgstr "--cherry-mark"
#. type: Plain text
-#: en/rev-list-options.txt:231
+#: en/rev-list-options.txt:230
#, priority:260
msgid "Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:232
+#: en/rev-list-options.txt:231
#, ignore-same, no-wrap, priority:260
msgid "--cherry-pick"
msgstr "--cherry-pick"
#. type: Plain text
-#: en/rev-list-options.txt:236
+#: en/rev-list-options.txt:235
#, priority:260
msgid "Omit any commit that introduces the same change as another commit on the ``other side'' when the set of commits are limited with symmetric difference."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:244
+#: en/rev-list-options.txt:243
#, priority:260
msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:245
+#: en/rev-list-options.txt:244
#, ignore-same, no-wrap, priority:260
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
-#: en/rev-list-options.txt:246
+#: en/rev-list-options.txt:245
#, ignore-same, no-wrap, priority:260
msgid "--right-only"
msgstr "--right-only"
#. type: Plain text
-#: en/rev-list-options.txt:250
+#: en/rev-list-options.txt:249
#, priority:260
msgid "List only commits on the respective side of a symmetric difference, i.e. only those which would be marked `<` resp. `>` by `--left-right`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:256
+#: en/rev-list-options.txt:255
#, ignore-ellipsis, priority:260
msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:257
+#: en/rev-list-options.txt:256
#, ignore-same, no-wrap, priority:260
msgid "--cherry"
msgstr "--cherry"
#. type: Plain text
-#: en/rev-list-options.txt:263
+#: en/rev-list-options.txt:262
#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:265
+#: en/rev-list-options.txt:264
#, ignore-same, no-wrap, priority:260
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
#. type: Plain text
-#: en/rev-list-options.txt:271
+#: en/rev-list-options.txt:270
#, ignore-ellipsis, priority:260
msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:278
+#: en/rev-list-options.txt:277
#, priority:260
msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:282
+#: en/rev-list-options.txt:281
#, priority:260
msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:285
+#: en/rev-list-options.txt:284
#, priority:260
msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:288
+#: en/rev-list-options.txt:287
#, priority:260
msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:290
+#: en/rev-list-options.txt:289
#, priority:260
msgid "Otherwise, show the index format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:296
+#: en/rev-list-options.txt:295
#, priority:260
msgid "Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:298
+#: en/rev-list-options.txt:297
#, priority:260
msgid "Under `--pretty=reference`, this information will not be shown at all."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:302
+#: en/rev-list-options.txt:301
#, priority:260
msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:303
+#: en/rev-list-options.txt:302
#, ignore-same, no-wrap, priority:260
msgid "--boundary"
msgstr "--boundary"
#. type: Plain text
-#: en/rev-list-options.txt:306
+#: en/rev-list-options.txt:305
#, priority:260
msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:308
+#: en/rev-list-options.txt:307
#, ignore-same, no-wrap, priority:260
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
#. type: Plain text
-#: en/rev-list-options.txt:313
+#: en/rev-list-options.txt:312
#, priority:260
msgid "Try to speed up the traversal using the pack bitmap index (if one is available). Note that when traversing with `--objects`, trees and blobs will not have their associated path printed."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:314
+#: en/rev-list-options.txt:313
#, no-wrap, priority:260
msgid "--progress=<header>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:317
+#: en/rev-list-options.txt:316
#, priority:260
msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:320
+#: en/rev-list-options.txt:319
#, no-wrap, priority:260
msgid "History Simplification"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:326
+#: en/rev-list-options.txt:325
#, priority:260
msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:328
+#: en/rev-list-options.txt:327
#, priority:260
msgid "The following options select the commits to be shown:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:329
+#: en/rev-list-options.txt:328
#, no-wrap, priority:260
msgid "<paths>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:331
+#: en/rev-list-options.txt:330
#, priority:260
msgid "Commits modifying the given <paths> are selected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:332
+#: en/rev-list-options.txt:331
#, ignore-same, no-wrap, priority:260
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
#. type: Plain text
-#: en/rev-list-options.txt:334
+#: en/rev-list-options.txt:333
#, priority:260
msgid "Commits that are referred by some branch or tag are selected."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:336
+#: en/rev-list-options.txt:335
#, priority:260
msgid "Note that extra commits can be shown to give a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:338
+#: en/rev-list-options.txt:337
#, priority:260
msgid "The following options affect the way the simplification is performed:"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:339 en/rev-list-options.txt:419
+#: en/rev-list-options.txt:338 en/rev-list-options.txt:418
#, no-wrap, priority:260
msgid "Default mode"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:344
+#: en/rev-list-options.txt:343
#, priority:260
msgid "Simplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
+#: en/rev-list-options.txt:344 en/rev-list-options.txt:674
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
#. type: Plain text
-#: en/rev-list-options.txt:350
+#: en/rev-list-options.txt:349
#, priority:260
msgid "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent. This mode is helpful for showing the merge commits that \"first introduced\" a change to a branch."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:351
+#: en/rev-list-options.txt:350
#, ignore-same, no-wrap, priority:260
msgid "--full-history"
msgstr "--full-history"
#. type: Plain text
-#: en/rev-list-options.txt:353
+#: en/rev-list-options.txt:352
#, priority:260
msgid "Same as the default mode, but does not prune some history."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:354 en/rev-list-options.txt:487
+#: en/rev-list-options.txt:353 en/rev-list-options.txt:486
#, ignore-same, no-wrap, priority:260
msgid "--dense"
msgstr "--dense"
#. type: Plain text
-#: en/rev-list-options.txt:357
+#: en/rev-list-options.txt:356
#, priority:260
msgid "Only the selected commits are shown, plus some to have a meaningful history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:360
+#: en/rev-list-options.txt:359
#, priority:260
msgid "All commits in the simplified history are shown."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:361 en/rev-list-options.txt:498
+#: en/rev-list-options.txt:360 en/rev-list-options.txt:497
#, ignore-same, no-wrap, priority:260
msgid "--simplify-merges"
msgstr "--simplify-merges"
#. type: Plain text
-#: en/rev-list-options.txt:365
+#: en/rev-list-options.txt:364
#, priority:260
msgid "Additional option to `--full-history` to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:366 en/rev-list-options.txt:545
+#: en/rev-list-options.txt:365 en/rev-list-options.txt:544
#, ignore-same, no-wrap, priority:260
msgid "--ancestry-path"
msgstr "--ancestry-path"
#. type: Plain text
-#: en/rev-list-options.txt:372
+#: en/rev-list-options.txt:371
#, priority:260
msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:374
+#: en/rev-list-options.txt:373
#, priority:260
msgid "A more detailed explanation follows."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:378
+#: en/rev-list-options.txt:377
#, priority:260
msgid "Suppose you specified `foo` as the <paths>. We shall call commits that modify `foo` !TREESAME, and the rest TREESAME. (In a diff filtered for `foo`, they look different and equal, respectively.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:382
+#: en/rev-list-options.txt:381
#, priority:260
msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file `foo` in this commit graph:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:388
+#: en/rev-list-options.txt:387
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -61620,73 +61711,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:391
+#: en/rev-list-options.txt:390
#, priority:260
msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:395
+#: en/rev-list-options.txt:394
#, priority:260
msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:397
+#: en/rev-list-options.txt:396
#, priority:260
msgid "In `A`, `foo` contains just ``foo''."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:400
+#: en/rev-list-options.txt:399
#, priority:260
msgid "`B` contains the same change as `A`. Its merge `M` is trivial and hence TREESAME to all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:403
+#: en/rev-list-options.txt:402
#, priority:260
msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:406
+#: en/rev-list-options.txt:405
#, priority:260
msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:409
+#: en/rev-list-options.txt:408
#, priority:260
msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:413
+#: en/rev-list-options.txt:412
#, priority:260
msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:418
+#: en/rev-list-options.txt:417
#, priority:260
msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:426
+#: en/rev-list-options.txt:425
#, priority:260
msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:428
+#: en/rev-list-options.txt:427
#, priority:260
msgid "This results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:433
+#: en/rev-list-options.txt:432
#, no-wrap, priority:260
msgid ""
"\t .-A---N---O\n"
@@ -61695,67 +61786,67 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:439
+#: en/rev-list-options.txt:438
#, priority:260
msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely. `C` was considered via `N`, but is TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:443
+#: en/rev-list-options.txt:442
#, priority:260
msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:444
+#: en/rev-list-options.txt:443
#, no-wrap, priority:260
msgid "--full-history without parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:450
+#: en/rev-list-options.txt:449
#, priority:260
msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:453
+#: en/rev-list-options.txt:452
#, no-wrap, priority:260
msgid "\tI A B N D O P Q\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:458
+#: en/rev-list-options.txt:457
#, priority:260
msgid "`M` was excluded because it is TREESAME to both parents. `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:462
+#: en/rev-list-options.txt:461
#, priority:260
msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:463
+#: en/rev-list-options.txt:462
#, no-wrap, priority:260
msgid "--full-history with parent rewriting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:466
+#: en/rev-list-options.txt:465
#, priority:260
msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:470
+#: en/rev-list-options.txt:469
#, priority:260
msgid "Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:477
+#: en/rev-list-options.txt:476
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O---P---Q\n"
@@ -61766,73 +61857,73 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:483
+#: en/rev-list-options.txt:482
#, priority:260
msgid "Compare to `--full-history` without rewriting above. Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`. The same happened for `C` and `N`, and `X`, `Y` and `Q`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:486
+#: en/rev-list-options.txt:485
#, priority:260
msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:490
+#: en/rev-list-options.txt:489
#, priority:260
msgid "Commits that are walked are included if they are not TREESAME to any parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:493
+#: en/rev-list-options.txt:492
#, priority:260
msgid "All commits that are walked are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:497
+#: en/rev-list-options.txt:496
#, priority:260
msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:501
+#: en/rev-list-options.txt:500
#, priority:260
msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:504
+#: en/rev-list-options.txt:503
#, priority:260
msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:507
+#: en/rev-list-options.txt:506
#, priority:260
msgid "Set `C'` to `C`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:512
+#: en/rev-list-options.txt:511
#, priority:260
msgid "Replace each parent `P` of `C'` with its simplification `P'`. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:516
+#: en/rev-list-options.txt:515
#, priority:260
msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:520
+#: en/rev-list-options.txt:519
#, priority:260
msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting. The example turns into:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:527
+#: en/rev-list-options.txt:526
#, no-wrap, priority:260
msgid ""
"\t .-A---M---N---O\n"
@@ -61843,49 +61934,49 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:530
+#: en/rev-list-options.txt:529
#, priority:260
msgid "Note the major differences in `N`, `P`, and `Q` over `--full-history`:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:534
+#: en/rev-list-options.txt:533
#, priority:260
msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`. Still, `N` remained because it is !TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:537
+#: en/rev-list-options.txt:536
#, priority:260
msgid "`P`'s parent list similarly had `I` removed. `P` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:541
+#: en/rev-list-options.txt:540
#, priority:260
msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:544
+#: en/rev-list-options.txt:543
#, priority:260
msgid "There is another simplification mode available:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:550
+#: en/rev-list-options.txt:549
#, priority:260
msgid "Limit the displayed commits to those directly on the ancestry chain between the ``from'' and ``to'' commits in the given commit range. I.e. only display commits that are ancestor of the ``to'' commit and descendants of the ``from'' commit."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:552
+#: en/rev-list-options.txt:551
#, priority:260
msgid "As an example use case, consider the following commit history:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:559
+#: en/rev-list-options.txt:558
#, no-wrap, priority:260
msgid ""
"\t D---E-------F\n"
@@ -61896,19 +61987,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:567
+#: en/rev-list-options.txt:566
#, priority:260
msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:573
+#: en/rev-list-options.txt:572
#, priority:260
msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e. excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:580
+#: en/rev-list-options.txt:579
#, no-wrap, priority:260
msgid ""
"\t\tE-------F\n"
@@ -61919,19 +62010,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:584
+#: en/rev-list-options.txt:583
#, priority:260
msgid "Before discussing another option, `--show-pulls`, we need to create a new example history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:589
+#: en/rev-list-options.txt:588
#, priority:260
msgid "A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:597
+#: en/rev-list-options.txt:596
#, no-wrap, priority:260
msgid ""
"\t .-A---M-----C--N---O---P\n"
@@ -61943,31 +62034,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:610
+#: en/rev-list-options.txt:609
#, priority:260
msgid "For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by resolving the merge conflict to include both changes from `A` and `B` and hence is not TREESAME to either. The merge commit `R`, however, was created by ignoring the contents of `file.txt` at `M` and taking only the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not `M`. Finally, the natural merge resolution to create `N` is to take the contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:614
+#: en/rev-list-options.txt:613
#, priority:260
msgid "When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:617
+#: en/rev-list-options.txt:616
#, no-wrap, priority:260
msgid "\tI---X\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:622
+#: en/rev-list-options.txt:621
#, priority:260
msgid "When using `--full-history`, Git walks every edge. This will discover the commits `A` and `B` and the merge `M`, but also will reveal the merge commits `O` and `P`. With parent rewriting, the resulting graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:630
+#: en/rev-list-options.txt:629
#, no-wrap, priority:260
msgid ""
"\t .-A---M--------N---O---P\n"
@@ -61979,19 +62070,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:638
+#: en/rev-list-options.txt:637
#, priority:260
msgid "Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the `--full-history` results."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:645
+#: en/rev-list-options.txt:644
#, priority:260
msgid "When using the `--simplify-merges` option, the commits `O` and `P` disappear from the results. This is because the rewritten second parents of `O` and `P` are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit `N`, resulting in a history view as follows:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:653
+#: en/rev-list-options.txt:652
#, no-wrap, priority:260
msgid ""
"\t .-A---M--.\n"
@@ -62003,55 +62094,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:660
+#: en/rev-list-options.txt:659
#, priority:260
msgid "In this view, we see all of the important single-parent changes from `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the not-so-carefully-resolved merge `R`. This is usually enough information to determine why the commits `A` and `B` \"disappeared\" from history in the default view. However, there are a few issues with this approach."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:665
+#: en/rev-list-options.txt:664
#, priority:260
msgid "The first issue is performance. Unlike any previous option, the `--simplify-merges` option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:674
+#: en/rev-list-options.txt:673
#, priority:260
msgid "The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge `R` above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge `N` was used to merge `R` and `X` into the important branch. This commit may have information about why the change `X` came to override the changes from `A` and `B` in its commit message."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:679
+#: en/rev-list-options.txt:678
#, priority:260
msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:684
+#: en/rev-list-options.txt:683
#, priority:260
msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:687
+#: en/rev-list-options.txt:686
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:692
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:696
+#: en/rev-list-options.txt:695
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:704
+#: en/rev-list-options.txt:703
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62063,43 +62154,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:710
+#: en/rev-list-options.txt:709
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:718
+#: en/rev-list-options.txt:717
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:722
+#: en/rev-list-options.txt:721
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:730
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:733
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:737
+#: en/rev-list-options.txt:736
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:741
+#: en/rev-list-options.txt:740
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62107,91 +62198,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:747
+#: en/rev-list-options.txt:746
#, priority:260
-msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
+msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:748
+#: en/rev-list-options.txt:747
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:759
+#: en/rev-list-options.txt:758
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:760
+#: en/rev-list-options.txt:759
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:766
+#: en/rev-list-options.txt:765
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:770
+#: en/rev-list-options.txt:769
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:774
+#: en/rev-list-options.txt:773
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:778
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:782
+#: en/rev-list-options.txt:781
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:786
+#: en/rev-list-options.txt:785
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:786
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:790
+#: en/rev-list-options.txt:789
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:795
+#: en/rev-list-options.txt:794
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:797
+#: en/rev-list-options.txt:796
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:803
+#: en/rev-list-options.txt:802
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62200,439 +62291,445 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:809
+#: en/rev-list-options.txt:808
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:814
+#: en/rev-list-options.txt:813
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:819
+#: en/rev-list-options.txt:818
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:822
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:826
+#: en/rev-list-options.txt:825
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:828
+#: en/rev-list-options.txt:827
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:833
+#: en/rev-list-options.txt:832
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:834
+#: en/rev-list-options.txt:833
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:838
+#: en/rev-list-options.txt:837
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:839
+#: en/rev-list-options.txt:838
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:845
+#: en/rev-list-options.txt:844
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:846
+#: en/rev-list-options.txt:845
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:850
+#: en/rev-list-options.txt:849
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:851
+#: en/rev-list-options.txt:850
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:855
+#: en/rev-list-options.txt:854
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:859
+#: en/rev-list-options.txt:858
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:859
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:863
+#: en/rev-list-options.txt:862
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:864
+#: en/rev-list-options.txt:863
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:869
+#: en/rev-list-options.txt:868
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:874
+#: en/rev-list-options.txt:873
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:876
+#: en/rev-list-options.txt:875
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:881
+#: en/rev-list-options.txt:880
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:886
+#: en/rev-list-options.txt:885
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:896
+#: en/rev-list-options.txt:895
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:899
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:903
+#: en/rev-list-options.txt:902
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:912
+#: en/rev-list-options.txt:911
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:915
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:919
+#: en/rev-list-options.txt:918
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:919
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:923
+#: en/rev-list-options.txt:922
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:930
+#: en/rev-list-options.txt:929
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:933
+#, priority:260
+msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
+msgstr ""
+
+#. type: Plain text
+#: en/rev-list-options.txt:937
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:941
+#: en/rev-list-options.txt:940
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:948
+#: en/rev-list-options.txt:947
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:950
+#: en/rev-list-options.txt:949
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:957
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:959
+#: en/rev-list-options.txt:958
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:961
+#: en/rev-list-options.txt:960
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:965
+#: en/rev-list-options.txt:964
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:971
+#: en/rev-list-options.txt:970
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:974
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:977
+#: en/rev-list-options.txt:976
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:978
+#: en/rev-list-options.txt:977
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:985
+#: en/rev-list-options.txt:984
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:990
+#: en/rev-list-options.txt:989
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:991
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:994
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:997
+#: en/rev-list-options.txt:996
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:998
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:998
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1001
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1005
+#: en/rev-list-options.txt:1004
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1007
+#: en/rev-list-options.txt:1006
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1016
+#: en/rev-list-options.txt:1015
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1023
+#: en/rev-list-options.txt:1022
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1027
+#: en/rev-list-options.txt:1026
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1033
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1037
+#: en/rev-list-options.txt:1036
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1039
+#: en/rev-list-options.txt:1038
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1041
+#: en/rev-list-options.txt:1040
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1042
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1046
+#: en/rev-list-options.txt:1045
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1051
+#: en/rev-list-options.txt:1050
#, 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:1052
+#: en/rev-list-options.txt:1051
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1055
+#: en/rev-list-options.txt:1054
#, 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:1057
+#: en/rev-list-options.txt:1056
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1059
+#: en/rev-list-options.txt:1058
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1061
+#: en/rev-list-options.txt:1060
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1066
+#: en/rev-list-options.txt:1065
#, 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:1068
+#: en/rev-list-options.txt:1067
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1074
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62643,19 +62740,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1077
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1081
+#: en/rev-list-options.txt:1080
#, 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:1088
+#: en/rev-list-options.txt:1087
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62667,89 +62764,47 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1090
+#: en/rev-list-options.txt:1089
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1096
+#: en/rev-list-options.txt:1095
#, 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:1098
+#: en/rev-list-options.txt:1097
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1101
+#: en/rev-list-options.txt:1100
#, 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:1102
+#: en/rev-list-options.txt:1101
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1108
+#: en/rev-list-options.txt:1107
#, 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:1118
+#: en/rev-list-options.txt:1117
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
-#. type: Title ~
-#: en/rev-list-options.txt:1124
-#, no-wrap, priority:260
-msgid "Diff Formatting"
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1129
-#, priority:260
-msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1136
-#, priority:260
-msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1142
-#, priority:260
-msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1157
-#, priority:260
-msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1160
-#, priority:260
-msgid "Show recursive diffs."
-msgstr ""
-
-#. type: Plain text
-#: en/rev-list-options.txt:1163
-#, priority:260
-msgid "Show the tree objects in the diff output. This implies `-r`."
-msgstr ""
-
#. type: Plain text
#: en/sequencer.txt:5
#, priority:100
@@ -65220,3 +65275,7 @@ msgstr ""
#, priority:100
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index f1ac1b1..65ed967 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-08-18 02:32+0000\n"
"Last-Translator: JunYeong Park <dahuin000@gmail.com>\n"
"Language-Team: Korean\n"
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9832,7 +9818,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17059,16 +17045,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20622,16 +20602,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22455,17 +22429,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22481,18 +22450,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25824,7 +25787,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39710,283 +39673,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49239,16 +49081,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49263,28 +49099,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49299,20 +49123,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53548,16 +53362,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54388,16 +54196,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54496,16 +54298,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54520,22 +54316,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59466,16 +59250,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59497,33 +59275,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59532,16 +59298,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59550,16 +59310,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59568,16 +59322,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59586,16 +59334,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59695,15 +59437,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59725,9 +59461,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59749,15 +59485,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59863,9 +59593,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59887,9 +59617,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59911,9 +59641,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60024,16 +59754,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60120,16 +59844,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60174,16 +59892,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60204,16 +59916,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60222,16 +59928,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60253,9 +59953,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60277,9 +59977,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60300,16 +60000,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65602,6 +65296,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 082bb76..87e316f 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-16 19:26+0000\n"
"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
"Language-Team: Marathi\n"
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9827,7 +9813,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17054,16 +17040,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20617,16 +20597,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22450,17 +22424,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22476,18 +22445,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25819,7 +25782,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39705,283 +39668,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49234,16 +49076,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49258,28 +49094,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49294,20 +49118,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53543,16 +53357,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54383,16 +54191,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54491,16 +54293,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54515,22 +54311,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59466,16 +59250,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59497,33 +59275,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59532,16 +59298,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59550,16 +59310,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59568,16 +59322,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59586,16 +59334,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59695,15 +59437,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59725,9 +59461,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59749,15 +59485,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59863,9 +59593,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59887,9 +59617,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59911,9 +59641,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60024,16 +59754,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60120,16 +59844,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60174,16 +59892,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60204,16 +59916,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60222,16 +59928,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60253,9 +59953,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60277,9 +59977,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60300,16 +60000,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65602,6 +65296,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 61085af..7cb53d8 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2019-10-14 23:28+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2435,18 +2435,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2455,16 +2447,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9827,7 +9813,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17054,16 +17040,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20617,16 +20597,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22450,17 +22424,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22476,18 +22445,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25824,7 +25787,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39710,283 +39673,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49242,16 +49084,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49266,28 +49102,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49302,20 +49126,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53558,16 +53372,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54398,16 +54206,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54506,16 +54308,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54530,22 +54326,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59484,16 +59268,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59515,33 +59293,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59550,16 +59316,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59568,16 +59328,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59586,16 +59340,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59604,16 +59352,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59717,17 +59459,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy, priority:260
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59749,10 +59485,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59773,16 +59510,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -59890,10 +59621,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -59915,10 +59647,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -59939,10 +59672,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60053,16 +59787,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60151,16 +59879,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60205,16 +59927,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60235,16 +59951,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60253,16 +59963,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60284,10 +59988,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60308,10 +60013,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60331,16 +60037,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65634,6 +65334,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 59afb57..985370f 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\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"
"Language: nl\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\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.2-dev\n"
@@ -2436,18 +2436,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2456,16 +2448,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9834,7 +9820,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17061,16 +17047,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20624,16 +20604,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22457,17 +22431,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22483,18 +22452,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25830,7 +25793,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39727,283 +39690,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "`commit`"
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49318,16 +49160,10 @@ msgstr ""
msgid "checkout"
msgstr "--no-checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49342,28 +49178,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49378,20 +49202,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53663,16 +53477,10 @@ msgstr "--no-where"
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54506,18 +54314,11 @@ msgid "See linkgit:git-repack[1] for options to generate new packs and replace e
msgstr ""
#. type: Plain text
-#: en/git-unpack-objects.txt:32
+#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:33
-#, fuzzy, priority:100
-#| msgid "--name-objects"
-msgid "the objects."
-msgstr "--name-objects"
-
#. type: Plain text
#: en/git-unpack-objects.txt:37
#, priority:100
@@ -54614,16 +54415,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54638,22 +54433,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59606,16 +59389,10 @@ msgstr "color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59637,33 +59414,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59672,16 +59437,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59690,16 +59449,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59708,16 +59461,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59726,16 +59473,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59837,17 +59578,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy, priority:260
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59869,10 +59604,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59893,16 +59629,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy, priority:260
#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
@@ -60009,10 +59739,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -60034,10 +59765,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -60058,10 +59790,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60172,16 +59905,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60271,16 +59998,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60325,16 +60046,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60355,16 +60070,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60373,16 +60082,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60404,10 +60107,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60428,10 +60132,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-switch[1], linkgit:git-restore[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60451,16 +60156,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65771,6 +65470,18 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, fuzzy
+#~ msgid "the objects."
+#~ msgstr "--name-objects"
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "linkgit:git-show-index[1]"
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 0a2e139..70e0538 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\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"
"Language: pl\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.0.2-dev\n"
@@ -2436,18 +2436,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2456,16 +2448,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9832,7 +9818,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17067,16 +17053,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20633,16 +20613,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22466,17 +22440,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22492,18 +22461,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25838,7 +25801,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39736,283 +39699,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "$ git commit\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49270,16 +49111,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49294,28 +49129,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49330,20 +49153,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53580,16 +53393,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54420,16 +54227,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54528,16 +54329,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54552,22 +54347,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59504,16 +59287,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59535,33 +59312,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59570,16 +59335,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59588,16 +59347,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59606,16 +59359,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59624,16 +59371,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59733,15 +59474,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59763,9 +59498,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59787,15 +59522,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59901,9 +59630,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59925,9 +59654,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59949,9 +59678,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60062,16 +59791,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60158,16 +59881,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60212,16 +59929,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60242,16 +59953,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60260,16 +59965,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60291,9 +59990,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60315,9 +60014,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60338,16 +60037,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65692,6 +65385,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.pot b/po/documentation.pot
index 5c00b63..28537ef 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,17 +7,19 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45
+#: en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126
+#: en/git-status.txt:31
#, no-wrap
msgid "-b"
msgstr ""
@@ -30,7 +32,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:582
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351
+#: en/git-fsck.txt:38 en/git-rebase.txt:582
#, no-wrap
msgid "--root"
msgstr ""
@@ -80,7 +83,10 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:45 en/git-config.txt:164 en/git-grep.txt:187 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:22 en/git-archive.txt:43 en/git-branch.txt:171
+#: en/git-checkout.txt:197 en/git-clone.txt:45 en/git-config.txt:164
+#: en/git-grep.txt:187 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
msgid "-l"
msgstr ""
@@ -91,7 +97,10 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
+#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158
+#: en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157
+#: en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26
+#: en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
#, no-wrap
msgid "-t"
msgstr ""
@@ -129,7 +138,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
+#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121
+#: en/rev-list-options.txt:124
#, no-wrap
msgid "--first-parent"
msgstr ""
@@ -144,13 +154,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22
+#: en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49
+#: en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41
+#: en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63
+#: en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44
+#: en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, no-wrap
msgid "-p"
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:216
+#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176
+#: en/git-worktree.txt:216
#, no-wrap
msgid "--porcelain"
msgstr ""
@@ -335,7 +351,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
+#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184
+#: en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
#, no-wrap
msgid "-h"
msgstr ""
@@ -2422,17 +2439,11 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap
msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+"Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable "
+"defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2441,15 +2452,9 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap
-msgid "`0` and the empty string.\n"
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -3047,7 +3052,8 @@ msgid "mode for \"src\"; 000000 if creation or unmerged."
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
+#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46
+#: en/diff-format.txt:48
msgid "a space."
msgstr ""
@@ -3318,7 +3324,8 @@ msgid "the number of added lines;"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175
+#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173
+#: en/diff-format.txt:175
msgid "a tab;"
msgstr ""
@@ -3635,7 +3642,8 @@ msgid "It is followed by two-line from-file/to-file header"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157
+#: en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
msgid "a/file"
msgstr ""
@@ -3741,13 +3749,17 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112
+#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
+#: en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52
+#: en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, no-wrap
msgid "-u"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269 en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269
+#: en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
#, no-wrap
msgid "--patch"
msgstr ""
@@ -3764,7 +3776,12 @@ msgid "\tThis is the default.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:120 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
+#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75
+#: en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67
+#: en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:120
+#: en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34
+#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
+#: en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
#, no-wrap
msgid "-s"
msgstr ""
@@ -3844,7 +3861,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
+#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19
+#: en/git-verify-tag.txt:19
#, no-wrap
msgid "--raw"
msgstr ""
@@ -4227,7 +4245,8 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:140
+#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35
+#: en/merge-options.txt:140
#, no-wrap
msgid "--summary"
msgstr ""
@@ -4251,7 +4270,11 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 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:174
+#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34
+#: en/git-check-ignore.txt:47 en/git-checkout-index.txt:67
+#: en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207
+#: 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:174
#, no-wrap
msgid "-z"
msgstr ""
@@ -4286,7 +4309,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189
+#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, no-wrap
msgid "--name-only"
msgstr ""
@@ -4330,7 +4354,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60
+#: en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap
msgid "--color[=<when>]"
msgstr ""
@@ -4351,7 +4376,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
+#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228
+#: en/git-show-branch.txt:124
#, no-wrap
msgid "--no-color"
msgstr ""
@@ -4793,7 +4819,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
+#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63
+#: en/git-show-ref.txt:65
#, no-wrap
msgid "--abbrev[=<n>]"
msgstr ""
@@ -5231,7 +5258,12 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:665 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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:665 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:65
+#: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102
+#: 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
#, no-wrap
msgid "-a"
msgstr ""
@@ -5271,7 +5303,8 @@ msgid "--ignore-space-change"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71
+#: en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, no-wrap
msgid "-w"
msgstr ""
@@ -5315,7 +5348,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264
+#: en/git-restore.txt:54
#, no-wrap
msgid "-W"
msgstr ""
@@ -5345,7 +5379,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:707 en/fetch-options.txt:238 en/git-am.txt:74 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:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222 en/merge-options.txt:147 en/rev-list-options.txt:219
+#: en/diff-options.txt:707 en/fetch-options.txt:238 en/git-am.txt:74
+#: 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:121
+#: en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49
+#: en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316
+#: en/git-imap-send.txt:37 en/git-init.txt:43 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:362 en/git-read-tree.txt:133 en/git-rebase.txt:398
+#: en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114
+#: en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71
+#: en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671
+#: en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222
+#: en/merge-options.txt:147 en/rev-list-options.txt:219
#, no-wrap
msgid "--quiet"
msgstr ""
@@ -5495,7 +5541,14 @@ msgid ""
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:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
+#: 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:66 en/git-describe.txt:50
+#: en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25
+#: en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77
+#: en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149
+#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37
+#: en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276
+#: en/rev-list-options.txt:137
#, no-wrap
msgid "--all"
msgstr ""
@@ -5650,7 +5703,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 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:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:212
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50
+#: en/git-commit.txt:333 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:51
+#: en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688
+#: en/git-worktree.txt:212
#, no-wrap
msgid "--dry-run"
msgstr ""
@@ -5676,13 +5735,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:76 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:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:153
+#: en/fetch-options.txt:76 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:139 en/git-mv.txt:31
+#: en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430
+#: en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46
+#: en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79
+#: en/git-worktree.txt:153
#, no-wrap
msgid "-f"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:77 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:325 en/git-replace.txt:61 en/git-rm.txt:47 en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290 en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
+#: en/fetch-options.txt:77 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:325 en/git-replace.txt:61 en/git-rm.txt:47
+#: en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290
+#: en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
#, no-wrap
msgid "--force"
msgstr ""
@@ -5715,13 +5787,17 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
+#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67
+#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115
+#: en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34
+#: en/git-repack.txt:156 en/git-stash.txt:176
#, no-wrap
msgid "-k"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
+#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54
+#: en/git-index-pack.txt:54 en/git-reset.txt:85
#, no-wrap
msgid "--keep"
msgstr ""
@@ -5802,7 +5878,8 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166
+#: en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap
msgid "-P"
msgstr ""
@@ -5824,7 +5901,16 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:138 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 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:211 en/merge-options.txt:92
+#: en/fetch-options.txt:138 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100
+#: en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39
+#: en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31
+#: en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34
+#: en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119
+#: en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50
+#: 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:211 en/merge-options.txt:92
#, no-wrap
msgid "-n"
msgstr ""
@@ -5863,7 +5949,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:159 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:159 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
msgid "--tags"
msgstr ""
@@ -5932,7 +6020,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
+#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377
+#: en/git-restore.txt:108 en/git-switch.txt:182
#, no-wrap
msgid "--no-recurse-submodules"
msgstr ""
@@ -6019,7 +6108,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:237 en/git-am.txt:73 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:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 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:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
+#: en/fetch-options.txt:237 en/git-am.txt:73 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:120 en/git-commit.txt:329
+#: en/git-diff-files.txt:44 en/git-fetch-pack.txt:48
+#: en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36
+#: en/git-init.txt:42 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:173
+#: en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361
+#: en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78
+#: en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113
+#: en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215
+#: en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140
+#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
+#: en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
#, no-wrap
msgid "-q"
msgstr ""
@@ -6032,30 +6134,57 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:401 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:225 en/merge-options.txt:150
+#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224
+#: en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181
+#: en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314
+#: en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82
+#: en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111
+#: en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32
+#: en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43
+#: en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41
+#: en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63
+#: en/git-rebase.txt:401 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:225
+#: en/merge-options.txt:150
#, no-wrap
msgid "-v"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402 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:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
+#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225
+#: en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126
+#: en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148
+#: en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40
+#: en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211
+#: en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42
+#: en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402
+#: 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:159
+#: en/git-verify-commit.txt:24 en/git-verify-pack.txt:27
+#: en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
#, no-wrap
msgid "--verbose"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:153
+#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35
+#: en/merge-options.txt:153
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
+#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111
+#: en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151
+#: en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66
+#: en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
#, no-wrap
msgid "--progress"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:376
+#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156
+#: en/git-push.txt:376
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 "
@@ -6155,7 +6284,59 @@ msgid "git-add(1)"
msgstr ""
#. type: Title -
-#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
+#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5
+#: en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5
+#: en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5
+#: en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5
+#: en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5
+#: en/git-checkout-index.txt:5 en/git-checkout.txt:5
+#: en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5
+#: en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5
+#: en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5
+#: en/git-config.txt:5 en/git-count-objects.txt:5
+#: en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5
+#: en/git-credential-store.txt:5 en/git-credential.txt:5
+#: en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5
+#: en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5
+#: en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5
+#: en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5
+#: en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5
+#: en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5
+#: en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5
+#: en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5
+#: en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5
+#: en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5
+#: en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5
+#: en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5
+#: en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5
+#: en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5
+#: en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5
+#: en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5
+#: en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5
+#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5
+#: en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5
+#: en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5
+#: en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5
+#: en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5
+#: en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5
+#: en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5
+#: en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5
+#: en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5
+#: en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5
+#: en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5
+#: en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5
+#: en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5
+#: en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5
+#: en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5
+#: en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5
+#: en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5
+#: en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5
+#: en/git-unpack-objects.txt:5 en/git-update-index.txt:5
+#: en/git-update-ref.txt:5 en/git-update-server-info.txt:5
+#: en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5
+#: en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5
+#: en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5
+#: en/git-write-tree.txt:5 en/gitglossary.txt:5
#, no-wrap
msgid "NAME"
msgstr ""
@@ -6166,7 +6347,60 @@ msgid "git-add - Add file contents to the index"
msgstr ""
#. type: Title -
-#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
+#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10
+#: en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10
+#: en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9
+#: en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10
+#: en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10
+#: en/git-checkout-index.txt:10 en/git-checkout.txt:9
+#: en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9
+#: en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10
+#: en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9
+#: en/git-config.txt:10 en/git-count-objects.txt:9
+#: en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9
+#: en/git-credential-store.txt:9 en/git-credential.txt:9
+#: en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9
+#: en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10
+#: en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10
+#: en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10
+#: en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9
+#: en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9
+#: en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10
+#: en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10
+#: en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9
+#: en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10
+#: en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10
+#: en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9
+#: en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10
+#: en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9
+#: en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10
+#: en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9
+#: en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10
+#: en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10
+#: en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10
+#: en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10
+#: en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9
+#: en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10
+#: en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10
+#: en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10
+#: en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10
+#: en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9
+#: en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9
+#: en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10
+#: en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10
+#: en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9
+#: en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10
+#: en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9
+#: en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10
+#: en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9
+#: en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10
+#: en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10
+#: en/git-update-index.txt:10 en/git-update-ref.txt:9
+#: en/git-update-server-info.txt:10 en/git-upload-archive.txt:10
+#: en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9
+#: en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9
+#: en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10
+#: en/gitglossary.txt:9
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
@@ -6185,7 +6419,61 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-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:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt: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:36 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt: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
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14
+#: en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18
+#: en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28
+#: en/git-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:20 en/git-config.txt:29
+#: en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14
+#: en/git-credential-cache.txt:15 en/git-credential-store.txt:15
+#: en/git-credential.txt:15 en/git-cvsexportcommit.txt:17
+#: en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27
+#: en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15
+#: en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt: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:36
+#: 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:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17
+#: en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19
+#: en/git-merge-file.txt:18 en/git-merge-index.txt:15
+#: en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14
+#: en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19
+#: en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15
+#: en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19
+#: en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15
+#: en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14
+#: en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16
+#: en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19
+#: en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15
+#: en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27
+#: en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14
+#: en/git-rerere.txt:14 en/git-reset.txt: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
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -6246,13 +6534,59 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-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:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:108 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:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 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:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 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:30 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:44 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:151 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24
+#: en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34
+#: en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96
+#: en/git-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:64 en/git-config.txt:72 en/git-count-objects.txt:20
+#: en/git-credential-cache.txt:27 en/git-credential-store.txt:30
+#: en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51
+#: en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36
+#: en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21
+#: en/git-diff-tree.txt:26 en/git-diff.txt:108 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:88 en/git-fsck.txt:22
+#: en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24
+#: en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24
+#: en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40
+#: 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:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70
+#: en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26
+#: en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30
+#: en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199
+#: en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29
+#: en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30
+#: en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32
+#: en/git-read-tree.txt:33 en/git-rebase.txt:210 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:30 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:44 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:151 en/git-write-tree.txt:29
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361 en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361
+#: en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141
+#: en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, no-wrap
msgid "<pathspec>..."
msgstr ""
@@ -6291,13 +6625,18 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 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:127 en/git-branch.txt:149
+#: en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88
+#: en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51
+#: en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163
+#: en/git-tag.txt:130 en/rev-list-options.txt:73
#, no-wrap
msgid "-i"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45
+#: en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
#, no-wrap
msgid "--interactive"
msgstr ""
@@ -6327,13 +6666,18 @@ msgid ""
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:220 en/git-config.txt:252 en/git-grep.txt:295 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:220 en/git-config.txt:252
+#: en/git-grep.txt:295 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
msgid "-e"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221 en/git-config.txt:253 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:221
+#: en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615
+#: en/git-tag.txt:178 en/merge-options.txt:15
#, no-wrap
msgid "--edit"
msgstr ""
@@ -6484,7 +6828,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200
+#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73
+#: en/rev-list-options.txt:200
#, no-wrap
msgid "--ignore-missing"
msgstr ""
@@ -6541,13 +6886,17 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
+#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282
+#: en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78
+#: en/git-stash.txt:198
#, no-wrap
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
+#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289
+#: en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85
+#: en/git-stash.txt:207
msgid ""
"Pathspec is passed in `<file>` instead of commandline args. If `<file>` is "
"exactly `-` then standard input is used. Pathspec elements are separated by "
@@ -6557,13 +6906,17 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
+#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290
+#: en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86
+#: en/git-stash.txt:208
#, no-wrap
msgid "--pathspec-file-nul"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
+#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294
+#: en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90
+#: en/git-stash.txt:214
msgid ""
"Only meaningful with `--pathspec-from-file`. Pathspec elements are separated "
"with NUL character and all other characters are taken literally (including "
@@ -6571,7 +6924,11 @@ msgid ""
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:355 en/git-commit.txt:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 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:355 en/git-commit.txt:358 en/git-grep.txt:324
+#: en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51
+#: en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60
+#: en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap
msgid "\\--"
msgstr ""
@@ -6584,7 +6941,29 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:511 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 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:135 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:294 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:169 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:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:393
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380
+#: en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71
+#: en/git-checkout-index.txt:143 en/git-checkout.txt:511
+#: en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169
+#: en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50
+#: en/git-commit.txt:370 en/git-config.txt:343 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:135
+#: 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:294
+#: en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67
+#: en/git-imap-send.txt:60 en/git-init.txt:151
+#: en/git-interpret-trailers.txt:256 en/git-log.txt:169 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:570 en/git-remote-ext.txt:77
+#: en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50
+#: en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125
+#: en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483
+#: en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124
+#: en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49
+#: en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27
+#: en/git-worktree.txt:393
#, no-wrap
msgid "EXAMPLES"
msgstr ""
@@ -6988,7 +7367,28 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:597 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:537 en/git-difftool.txt:137 en/git-diff.txt:205 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:415 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28
+#: en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504
+#: en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115
+#: en/git-check-ignore.txt:119 en/git-checkout.txt:597
+#: 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:537 en/git-difftool.txt:137
+#: en/git-diff.txt:205 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:415 en/git-format-patch.txt:714 en/git-gc.txt:153
+#: en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89
+#: en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245
+#: en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404
+#: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81
+#: en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251
+#: en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249
+#: en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209
+#: en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521
+#: en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349
+#: en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170
+#: en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001
+#: en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63
+#: en/gitglossary.txt:18
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -7001,13 +7401,121 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:602 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:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:215 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:419 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 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:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:178 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:419 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32
+#: en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202
+#: en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382
+#: en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318
+#: en/git-check-attr.txt:119 en/git-check-ignore.txt:125
+#: en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176
+#: en/git-checkout.txt:602 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:353 en/git-column.txt:78
+#: en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499
+#: 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-cvsexportcommit.txt:117 en/git-cvsimport.txt:227
+#: en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206
+#: en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148
+#: en/git-diff-tree.txt:125 en/git-diff.txt:215 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:419 en/git-format-patch.txt:718
+#: en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160
+#: en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 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:55 en/git-http-push.txt:96 en/git-imap-send.txt:143
+#: en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167
+#: en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288
+#: en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103
+#: en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246
+#: en/git-merge-file.txt:94 en/git-merge-index.txt:82
+#: en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48
+#: en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376
+#: en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68
+#: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410
+#: en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72
+#: en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46
+#: en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672
+#: en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284
+#: en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124
+#: en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187
+#: en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221
+#: en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144
+#: en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195
+#: en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105
+#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42
+#: en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51
+#: en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94
+#: en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442
+#: en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174
+#: en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391
+#: en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
+#: en/git-update-index.txt:575 en/git-update-ref.txt:178
+#: 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:419
+#: en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:603 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:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:216 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:420 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 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:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:179 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:420 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33
+#: en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203
+#: en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383
+#: en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319
+#: en/git-check-attr.txt:120 en/git-check-ignore.txt:126
+#: en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177
+#: en/git-checkout.txt:603 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:354 en/git-column.txt:79
+#: en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500
+#: 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-cvsexportcommit.txt:118 en/git-cvsimport.txt:228
+#: en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207
+#: en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149
+#: en/git-diff-tree.txt:126 en/git-diff.txt:216 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:420 en/git-format-patch.txt:719
+#: en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161
+#: en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 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:56 en/git-http-push.txt:97 en/git-imap-send.txt:144
+#: en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168
+#: en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289
+#: en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104
+#: en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247
+#: en/git-merge-file.txt:95 en/git-merge-index.txt:83
+#: en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49
+#: en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377
+#: en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69
+#: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411
+#: en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73
+#: en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47
+#: en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673
+#: en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285
+#: en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125
+#: en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188
+#: en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222
+#: en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145
+#: en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196
+#: en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106
+#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43
+#: en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52
+#: en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95
+#: en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443
+#: en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175
+#: en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392
+#: en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
+#: en/git-update-index.txt:576 en/git-update-ref.txt:179
+#: 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:420
+#: en/git-write-tree.txt:42 en/gitglossary.txt:27
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -7059,7 +7567,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101 en/merge-options.txt:80
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167
+#: en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101
+#: en/merge-options.txt:80
#, no-wrap
msgid "--signoff"
msgstr ""
@@ -7104,7 +7614,11 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132
+#: en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37
+#: en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54
+#: en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79
+#: en/git-stripspace.txt:42
#, no-wrap
msgid "-c"
msgstr ""
@@ -7135,7 +7649,13 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240
+#: en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118
+#: en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69
+#: en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43
+#: en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347
+#: en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675
+#: en/git-switch.txt:118 en/git-symbolic-ref.txt:49
#, no-wrap
msgid "-m"
msgstr ""
@@ -7235,19 +7755,22 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115
+#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85
+#: en/git-rebase.txt:383 en/git-revert.txt:115
#, no-wrap
msgid "--rerere-autoupdate"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116
+#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86
+#: en/git-rebase.txt:384 en/git-revert.txt:116
#, no-wrap
msgid "--no-rerere-autoupdate"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119
+#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89
+#: en/git-rebase.txt:387 en/git-revert.txt:119
msgid ""
"Allow the rerere mechanism to update the index with the result of "
"auto-conflict resolution if possible."
@@ -7372,25 +7895,32 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62
+#: en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91
+#: en/merge-options.txt:62
#, no-wrap
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63
+#: en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92
+#: en/merge-options.txt:63
#, no-wrap
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
+#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64
+#: en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93
+#: en/merge-options.txt:64
#, no-wrap
msgid "--no-gpg-sign"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:396 en/git-revert.txt:99
+#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357
+#: en/git-rebase.txt:396 en/git-revert.txt:99
msgid ""
"GPG-sign commits. The `keyid` argument is optional and defaults to the "
"committer identity; if specified, it must be stuck to the option without a "
@@ -7399,13 +7929,17 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1
+#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247
+#: en/sequencer.txt:1
#, no-wrap
msgid "--continue"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79
+#: en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44
+#: en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56
+#: en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#, no-wrap
msgid "-r"
msgstr ""
@@ -7441,7 +7975,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15
+#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201
+#: en/git-rebase.txt:250 en/sequencer.txt:15
#, no-wrap
msgid "--abort"
msgstr ""
@@ -7452,7 +7987,8 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10
+#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257
+#: en/sequencer.txt:10
#, no-wrap
msgid "--quit"
msgstr ""
@@ -7477,7 +8013,11 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:226 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:81 en/git-stash.txt:245 en/git-tag.txt:231
+#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386
+#: en/git-fsck.txt:113 en/git-log.txt:226 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:81 en/git-stash.txt:245
+#: en/git-tag.txt:231
#, no-wrap
msgid "DISCUSSION"
msgstr ""
@@ -7738,7 +8278,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29
+#: en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65
+#: en/git-submodule.txt:302
#, no-wrap
msgid "--cached"
msgstr ""
@@ -8095,7 +8637,14 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300
+#: en/git-config.txt:268 en/git-cvsexportcommit.txt:86
+#: en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108
+#: en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52
+#: en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358
+#: en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444
+#: en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215
+#: en/git-update-index.txt:525
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
@@ -8301,7 +8850,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:214
+#: en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, no-wrap
msgid "-o"
msgstr ""
@@ -8415,7 +8965,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165
+#: en/git-show-branch.txt:80 en/git-tag.txt:100
#, no-wrap
msgid "--list"
msgstr ""
@@ -8521,7 +9072,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
+#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26
+#: en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
#, no-wrap
msgid "<tree-ish>"
msgstr ""
@@ -9208,7 +9760,9 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:245 en/git-tag.txt:373 en/git-bisect-lk2009.txt:914 en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152 en/git-bisect-lk2009.txt:1175
+#: en/git-bisect.txt:245 en/git-tag.txt:373 en/git-bisect-lk2009.txt:914
+#: en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152
+#: en/git-bisect-lk2009.txt:1175
msgid "For example:"
msgstr ""
@@ -10239,13 +10793,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:179
+#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28
+#: en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44
+#: en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41
+#: en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65
+#: en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35
+#: en/git-tag.txt:83 en/git-worktree.txt:179
#, no-wrap
msgid "-d"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
+#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66
+#: en/git-symbolic-ref.txt:36 en/git-tag.txt:84
#, no-wrap
msgid "--delete"
msgstr ""
@@ -10350,7 +10910,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114
+#: en/git-tag.txt:131
#, no-wrap
msgid "--ignore-case"
msgstr ""
@@ -10672,7 +11233,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
+#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65
+#: en/git-tag.txt:112
#, no-wrap
msgid "--sort=<key>"
msgstr ""
@@ -10812,7 +11374,9 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115
+#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
+#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
@@ -11752,7 +12316,11 @@ msgid ""
msgstr ""
#. 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:190 en/git-push.txt:409 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
+#: 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:190 en/git-push.txt:409 en/git-show-branch.txt:134
+#: en/git-show-ref.txt:97 en/git-status.txt:156
+#: en/git-update-server-info.txt:23
#, no-wrap
msgid "OUTPUT"
msgstr ""
@@ -12100,7 +12668,12 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43
+#: en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62
+#: en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51
+#: en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38
+#: en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41
+#: en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
#, no-wrap
msgid "--stdin"
msgstr ""
@@ -12661,7 +13234,10 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360
+#: en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53
+#: en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229
+#: en/git-verify-pack.txt:38
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -13049,12 +13625,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221
+#: en/git-switch.txt:143
msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:67 en/git-switch.txt:145 en/merge-options.txt:155
+#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:67
+#: en/git-switch.txt:145 en/merge-options.txt:155
#, no-wrap
msgid "--no-progress"
msgstr ""
@@ -13218,7 +13796,8 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:180
+#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82
+#: en/git-worktree.txt:180
#, no-wrap
msgid "--detach"
msgstr ""
@@ -13292,7 +13871,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
+#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638
+#: en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365
+#: en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
#, no-wrap
msgid "--merge"
msgstr ""
@@ -13403,7 +13984,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:107 en/git-switch.txt:181
+#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150
+#: en/git-restore.txt:107 en/git-switch.txt:181
#, no-wrap
msgid "--recurse-submodules"
msgstr ""
@@ -13516,7 +14098,8 @@ msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132 en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
+#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132
+#: en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
@@ -14218,7 +14801,8 @@ msgid "See linkgit:git-merge[1] for some hints on resolving such conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:43 en/git-merge.txt:121 en/git-revert.txt:36 en/git-verify-commit.txt:27
+#: en/git-cherry-pick.txt:43 en/git-merge.txt:121 en/git-revert.txt:36
+#: en/git-verify-commit.txt:27
#, no-wrap
msgid "<commit>..."
msgstr ""
@@ -14242,7 +14826,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
+#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70
+#: en/git-tag.txt:183 en/merge-options.txt:35
#, no-wrap
msgid "--cleanup=<mode>"
msgstr ""
@@ -14371,7 +14956,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328 en/git-rebase.txt:641
+#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328
+#: en/git-rebase.txt:641
#, no-wrap
msgid "--allow-empty-message"
msgstr ""
@@ -14401,7 +14987,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
+#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362
+#: en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
#, no-wrap
msgid "--strategy=<strategy>"
msgstr ""
@@ -15142,7 +15729,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24
+#: en/git-pack-objects.txt:142 en/git-svn.txt:245
#, no-wrap
msgid "--local"
msgstr ""
@@ -15322,7 +15910,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490
+#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357
+#: en/rev-list-options.txt:490
#, no-wrap
msgid "--sparse"
msgstr ""
@@ -15622,7 +16211,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:299 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:299 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83
+#: en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap
msgid "<repository>"
msgstr ""
@@ -15635,7 +16225,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:304 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
+#: en/git-clone.txt:304 en/git-cvsserver.txt:53 en/git-daemon.txt:220
+#: en/git-receive-pack.txt:41 en/git-send-pack.txt:95
+#: en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap
msgid "<directory>"
msgstr ""
@@ -15966,7 +16558,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
+#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47
+#: en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
#, no-wrap
msgid "-F <file>"
msgstr ""
@@ -16029,7 +16622,9 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:527 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:91 en/git-commit.txt:527 en/git-config.txt:275
+#: en/git-credential-store.txt:45 en/git-show-ref.txt:174
+#: en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap
msgid "FILES"
msgstr ""
@@ -16268,7 +16863,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
+#: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52
+#: en/git-status.txt:47
#, no-wrap
msgid "--long"
msgstr ""
@@ -16297,7 +16893,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
+#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141
+#: en/git-tag.txt:171
#, no-wrap
msgid "--file=<file>"
msgstr ""
@@ -16337,13 +16934,15 @@ msgid "Override the author date used in the commit."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:147 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
+#: en/git-commit.txt:147 en/git-merge.txt:66 en/git-notes.txt:132
+#: en/git-svn.txt:468 en/git-tag.txt:162
#, no-wrap
msgid "-m <msg>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
+#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469
+#: en/git-tag.txt:163
#, no-wrap
msgid "--message=<msg>"
msgstr ""
@@ -17227,7 +17826,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
+#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135
+#: en/git-config.txt:339
msgid "See also <<FILES>>."
msgstr ""
@@ -17715,7 +18315,8 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:327 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:327 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 ""
@@ -17983,7 +18584,10 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:478 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:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:413
+#: en/git-config.txt:478 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:1261 en/git-replace.txt:139 en/git-rm.txt:182
+#: en/git-svn.txt:1065 en/git-worktree.txt:413
#, no-wrap
msgid "BUGS"
msgstr ""
@@ -19052,15 +19656,11 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap
-msgid "exist, it will be created. Default is the current directory.\n"
+msgid ""
+"The Git repository to import to. If the directory doesn't exist, it will be "
+"created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -21773,7 +22373,9 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:263
+#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82
+#: en/git-show-branch.txt:111 en/git-update-index.txt:128
+#: en/rev-list-options.txt:263
#, no-wrap
msgid "-g"
msgstr ""
@@ -22409,7 +23011,8 @@ msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:176 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:176 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52
+#: en/git-web--browse.txt:52
msgid "Same as above."
msgstr ""
@@ -23222,14 +23825,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
msgid ""
+"Rewrite the object IDs for the submodule specified by <name> from the values "
"used in the from <file> to those used in the to <file>. The from marks "
"should have been created by `git fast-export`, and the to marks should have "
"been created by `git fast-import` when importing that same submodule."
@@ -23287,7 +23886,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85 en/git-pack-objects.txt:89 en/git-repack.txt:90
+#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85
+#: en/git-pack-objects.txt:89 en/git-repack.txt:90
#, no-wrap
msgid "--depth=<n>"
msgstr ""
@@ -24949,7 +25549,8 @@ msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079
+#: en/git-fast-import.txt:1132
msgid ""
"See ``Responses To Commands'' below for details about how to read this "
"output safely."
@@ -25443,17 +26044,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -25467,18 +26063,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -28016,7 +28606,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
+#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197
+#: en/pretty-options.txt:2
#, no-wrap
msgid "--format=<format>"
msgstr ""
@@ -28544,7 +29135,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317 en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
+#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317
+#: en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
#, no-wrap
msgid "#!/bin/sh\n"
msgstr ""
@@ -29563,7 +30155,7 @@ msgstr ""
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -31637,7 +32229,9 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:60
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32
+#: en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33
+#: en/git-svn.txt:29 en/git-worktree.txt:60
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -32120,7 +32714,8 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:556 en/git-web--browse.txt:59
+#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:556
+#: en/git-web--browse.txt:59
#, no-wrap
msgid "CONFIGURATION VARIABLES"
msgstr ""
@@ -34609,7 +35204,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
+#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283
+#: en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
#, no-wrap
msgid "message\n"
msgstr ""
@@ -44805,7 +45401,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288 en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335 en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382 en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484 en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516 en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593 en/git-rebase.txt:612
+#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288
+#: en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335
+#: en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382
+#: en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484
+#: en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516
+#: en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593
+#: en/git-rebase.txt:612
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -45071,7 +45673,8 @@ msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
+#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59
+#: en/git-tag.txt:88
#, no-wrap
msgid "--verify"
msgstr ""
@@ -45566,282 +46169,231 @@ msgstr ""
msgid "--fork-point and --root"
msgstr ""
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
+#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap
msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+"git rebase has two primary backends: apply and merge. (The apply backend "
+"used to be known as the 'am' backend, but the name led to confusion as it "
+"looks like a verb instead of a noun. Also, the merge backend used to be "
+"known as the interactive backend, but it is now used for non-interactive "
+"cases as well. Both were renamed based on lower-level functionality that "
+"underpinned each.) There are some subtle differences in how these two "
+"backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
+#. type: Title ~
+#: en/git-rebase.txt:677
#, no-wrap
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
+msgid "Empty commits"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap
msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+"The apply backend unfortunately drops intentionally empty commits, i.e. "
+"commits that started empty, though these are rare in practice. It also "
+"drops commits that become empty and has no option for controlling this "
+"behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap
msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+"The merge backend keeps intentionally empty commits by default (though with "
+"-i they are marked as empty in the todo list editor, or they can be dropped "
+"automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap
msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+"Similar to the apply backend, by default the merge backend drops commits "
+"that become empty unless -i/--interactive is specified (in which case it "
+"stops and asks the user what to do). The merge backend also has an "
+"--empty={drop,keep,ask} option for changing the behavior of handling commits "
+"that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap
msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+"Due to the lack of accurate tree information (arising from constructing fake "
+"ancestors with the limited information available in patches), directory "
+"rename detection is disabled in the apply backend. Disabled directory "
+"rename detection means that if one side of history renames a directory and "
+"the other adds new files to the old directory, then the new files will be "
+"left behind in the old directory without any warning at the time of rebasing "
+"that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap
msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+"Directory rename detection works with the merge backend to provide you "
+"warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
+#. type: Title ~
+#: en/git-rebase.txt:710
#, no-wrap
-msgid ""
-"Context\n"
-"~~~~~~~\n"
+msgid "Context"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap
msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+"The apply backend works by creating a sequence of patches (by calling "
+"`format-patch` internally), and then applying the patches in sequence "
+"(calling `am` internally). Patches are composed of multiple hunks, each "
+"with line numbers, a context region, and the actual changes. The line "
+"numbers have to be taken with some fuzz, since the other side will likely "
+"have inserted or deleted lines earlier in the file. The context region is "
+"meant to help find how to adjust the line numbers in order to apply the "
+"changes to the right lines. However, if multiple areas of the code have the "
+"same surrounding lines of context, the wrong one can be picked. There are "
+"real-world cases where this has caused commits to be reapplied incorrectly "
+"with no conflicts reported. Setting diff.context to a larger value may "
+"prevent such types of problems, but increases the chance of spurious "
+"conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap
msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+"The merge backend works with a full copy of each relevant file, insulating "
+"it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap
msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+"When there are content conflicts, the merge machinery tries to annotate each "
+"side's conflict markers with the commits where the content came from. Since "
+"the apply backend drops the original information about the rebased commits "
+"and their parents (and instead generates new fake commits based off limited "
+"information in the generated patches), those commits cannot be identified; "
+"instead it has to fall back to a commit summary. Also, when "
+"merge.conflictStyle is set to diff3, the apply backend will use "
+"\"constructed merge base\" to label the content from the merge base, and "
+"thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap
msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+"The merge backend works with the full commits on both sides of history and "
+"thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap
msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+"The apply backend has not traditionally called the post-commit hook, while "
+"the merge backend has. Both have called the post-checkout hook, though the "
+"merge backend has squelched its output. Further, both backends only call "
+"the post-checkout hook with the starting point commit of the rebase, not the "
+"intermediate commits nor the final commit. In each case, the calling of "
+"these hooks was by accident of implementation rather than by design (both "
+"backends were originally implemented as shell scripts and happened to invoke "
+"other commands like 'git checkout' or 'git commit' that would call the "
+"hooks). Both backends should have the same behavior, though it is not "
+"entirely clear which, if any, is correct. We will likely make rebase stop "
+"calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap
msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+"The apply backend has safety problems with an ill-timed interrupt; if the "
+"user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase "
+"can enter a state where it cannot be aborted with a subsequent `git rebase "
+"--abort`. The merge backend does not appear to suffer from the same "
+"shortcoming. (See "
+"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap
msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+"When a conflict occurs while rebasing, rebase stops and asks the user to "
+"resolve. Since the user may need to make notable changes while resolving "
+"conflicts, after conflicts are resolved and the user has run `git rebase "
+"--continue`, the rebase should open an editor and ask the user to update the "
+"commit message. The merge backend does this, while the apply backend "
+"blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap
msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+"There are a few more behavioral differences that most folks would probably "
+"consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap
msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+"Reflog: The two backends will use different wording when describing the "
+"changes made in the reflog, though both will make use of the word "
+"\"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, no-wrap
msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+"Progress, informational, and error messages: The two backends provide "
+"slightly different progress and informational messages. Also, the apply "
+"backend writes error messages (such as \"Your files would be "
+"overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap
msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap
-msgid "NOTES\n"
+"State directories: The two backends keep their state in different "
+"directories under .git/"
msgstr ""
#. type: Plain text
@@ -55000,7 +55552,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180
+#: en/git-stash.txt:186
msgid "This option is only valid for `push` and `save` commands."
msgstr ""
@@ -55072,7 +55625,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224
+#: en/git-stash.txt:229
msgid "This option is only valid for `push` command."
msgstr ""
@@ -56424,15 +56978,11 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap
-msgid "checked out in the submodule on a detached HEAD.\n"
+msgid ""
+"the commit recorded in the superproject will be checked out in the submodule "
+"on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -56450,26 +57000,18 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-msgid "the commit recorded in the superproject will be merged"
+msgid ""
+"the current branch of the submodule will be rebased onto the commit recorded "
+"in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap
-msgid "into the current branch in the submodule.\n"
+msgid ""
+"the commit recorded in the superproject will be merged into the current "
+"branch in the submodule."
msgstr ""
#. type: Plain text
@@ -56485,19 +57027,13 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap
msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+"arbitrary shell command that takes a single argument (the sha1 of the commit "
+"recorded in the superproject) is executed. When `submodule.<name>.update` is "
+"set to '!command', the remainder after the exclamation mark is the custom "
+"command."
msgstr ""
#. type: Plain text
@@ -61513,15 +62049,9 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap
-msgid "contents of <old|new>,\n"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -62524,14 +63054,9 @@ msgid ""
"existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -62636,15 +63161,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:62
+#: en/git-update-index.txt:63
msgid ""
"Quiet. If --refresh finds that the index needs an update, the default "
-"behavior is to error out. This option makes"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:63
-msgid "'git update-index' continue anyway."
+"behavior is to error out. This option makes 'git update-index' continue "
+"anyway."
msgstr ""
#. type: Labeled list
@@ -62660,20 +63181,11 @@ msgid ""
"before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap
-msgid "continue anyway.\n"
+msgid ""
+"If --refresh finds unmerged changes in the index, the default behavior is to "
+"error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -68154,7 +68666,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63
+#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51
+#: en/pretty-formats.txt:63
#, no-wrap
msgid "<title line>\n"
msgstr ""
@@ -68174,7 +68687,8 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
+#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65
+#: en/pretty-formats.txt:85
msgid "<full commit message>"
msgstr ""
@@ -68396,18 +68910,14 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
msgid ""
-"\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors "
-"are shown only when enabled for log output (by `color.diff`, `color.ui`, or "
-"`--color`, and respecting the `auto` settings of the former if we are going "
-"to a terminal). `%C(auto,...)` is accepted as a historical synonym for the "
+"color specification, as described under Values in the \"CONFIGURATION FILE\" "
+"section of linkgit:git-config[1]. By default, colors are shown only when "
+"enabled for log output (by `color.diff`, `color.ui`, or `--color`, and "
+"respecting the `auto` settings of the former if we are going to a "
+"terminal). `%C(auto,...)` is accepted as a historical synonym for the "
"default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the "
"colors even when color is not otherwise enabled (though consider just using "
"`--color=always` to enable color for the whole output, including this format "
@@ -68433,14 +68943,9 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:148
-msgid "switch line wrapping, like the -w option of"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "linkgit:git-shortlog[1]."
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
@@ -68449,18 +68954,13 @@ msgstr ""
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
msgid ""
-"least N columns, padding spaces on the right if necessary. Optionally "
-"truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) "
-"if the output is longer than N columns. Note that truncating only works "
-"correctly with N >= 2."
+"make the next placeholder take at least N columns, padding spaces on the "
+"right if necessary. Optionally truncate at the beginning (ltrunc), the "
+"middle (mtrunc) or the end (trunc) if the output is longer than N columns. "
+"Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -68469,14 +68969,11 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid "columns, padding spaces on the right if necessary"
+msgid ""
+"make the next placeholder take at least until Nth columns, padding spaces on "
+"the right if necessary"
msgstr ""
#. type: Labeled list
@@ -68485,14 +68982,11 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid "but padding spaces on the left"
+msgid ""
+"similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the "
+"left"
msgstr ""
#. type: Labeled list
@@ -68501,16 +68995,12 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
msgid ""
-"respectively, except that if the next placeholder takes more spaces than "
-"given and there are spaces on its left, use those spaces"
+"similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next "
+"placeholder takes more spaces than given and there are spaces on its left, "
+"use those spaces"
msgstr ""
#. type: Labeled list
@@ -68519,14 +69009,11 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid ""
+"similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides "
+"(i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -68618,13 +69105,10 @@ msgid "'%aN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:179
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-msgid "or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:180
+msgid ""
+"author name (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68645,8 +69129,10 @@ msgid "'%aE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:182
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:183
+msgid ""
+"author email (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68667,13 +69153,10 @@ msgid "'%aL'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:185
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+msgid ""
+"author local-part (see '%al') respecting .mailmap, see "
+"linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68771,8 +69254,10 @@ msgid "'%cN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:195
-msgid "committer name (respecting .mailmap, see"
+#: en/pretty-formats.txt:196
+msgid ""
+"committer name (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68793,8 +69278,10 @@ msgid "'%cE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:198
-msgid "committer email (respecting .mailmap, see"
+#: en/pretty-formats.txt:199
+msgid ""
+"committer email (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68815,8 +69302,10 @@ msgid "'%cL'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:201
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+#: en/pretty-formats.txt:202
+msgid ""
+"committer local-part (see '%cl') respecting .mailmap, see "
+"linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -68918,14 +69407,11 @@ msgstr ""
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid "(like `git log --source`), only works with `git log`"
+msgid ""
+"ref name given on the command line by which the commit was reached (like "
+"`git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -69005,19 +69491,14 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
msgid ""
-"\"B\" for a bad signature, \"U\" for a good signature with unknown validity, "
-"\"X\" for a good signature that has expired, \"Y\" for a good signature made "
-"by an expired key, \"R\" for a good signature made by a revoked key, \"E\" "
-"if the signature cannot be checked (e.g. missing key) and \"N\" for no "
-"signature"
+"show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" "
+"for a good signature with unknown validity, \"X\" for a good signature that "
+"has expired, \"Y\" for a good signature made by an expired key, \"R\" for a "
+"good signature made by a revoked key, \"E\" if the signature cannot be "
+"checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -69059,14 +69540,11 @@ msgstr ""
msgid "'%GP'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:234
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid "to sign a signed commit"
+msgid ""
+"show the fingerprint of the primary key whose subkey was used to sign a "
+"signed commit"
msgstr ""
#. type: Labeled list
@@ -69086,18 +69564,13 @@ msgstr ""
msgid "'%gD'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:237
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
msgid ""
-"minutes ago}`; the format follows the rules described for the `-g` "
-"option. The portion before the `@` is the refname as given on the command "
-"line (so `git log -g refs/heads/master` would yield "
-"`refs/heads/master@{0}`)."
+"reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the "
+"format follows the rules described for the `-g` option. The portion before "
+"the `@` is the refname as given on the command line (so `git log -g "
+"refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -69106,16 +69579,12 @@ msgstr ""
msgid "'%gd'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:242
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
msgid ""
-"portion is shortened for human readability (so `refs/heads/master` becomes "
-"just `master`)."
+"shortened reflog selector; same as `%gD`, but the refname portion is "
+"shortened for human readability (so `refs/heads/master` becomes just "
+"`master`)."
msgstr ""
#. type: Labeled list
@@ -69136,8 +69605,10 @@ msgid "'%gN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:246
-msgid "reflog identity name (respecting .mailmap, see"
+#: en/pretty-formats.txt:247
+msgid ""
+"reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -69158,8 +69629,10 @@ msgid "'%gE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:249
-msgid "reflog identity email (respecting .mailmap, see"
+#: en/pretty-formats.txt:250
+msgid ""
+"reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or "
+"linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -69179,16 +69652,12 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
msgid ""
-"interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may "
-"be followed by a colon and zero or more comma-separated options:"
+"display the trailers of the body as interpreted by "
+"linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by "
+"a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -73447,7 +73916,8 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect-lk2009.txt:259 en/git-bisect-lk2009.txt:273 en/git-bisect-lk2009.txt:333
+#: en/git-bisect-lk2009.txt:259 en/git-bisect-lk2009.txt:273
+#: en/git-bisect-lk2009.txt:333
#, no-wrap
msgid " Linux 2.6.26-rc1\n"
msgstr ""
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 91d35b1..8f5da04 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-21 02:26+0000\n"
"Last-Translator: Henrique Sant'Anna <hsantanna@gmail.com>\n"
"Language-Team: none\n"
@@ -134,10 +134,7 @@ msgstr "--first-parent"
#: en/blame-options.txt:44
#, priority:100
msgid "Follow only the first parent commit upon seeing a merge commit. This option can be used to determine when a line was introduced to a particular integration branch, rather than when it was introduced to the history overall."
-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."
+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:45 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
@@ -2475,18 +2472,13 @@ msgstr "Quando uma variável pega um valor booleano, muitos sinônimos são acei
msgid "true"
msgstr "verdadeiro"
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr "Os literais booleanos verdadeiros são `yes`, `on`, `true`,"
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "and `1`. Also, a variable defined without `= <value>`\n"
+#| "is taken as true.\n"
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
"e `1`. Além disso, uma variável definida sem `= <valor>`\n"
"é tida como verdadeira.\n"
@@ -2497,17 +2489,12 @@ msgstr ""
msgid "false"
msgstr "falso"
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr "Os falsos literais booleanos são `no`, `off`, `false`,"
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
-msgstr "`0` e uma cadeia de caracteres vazios.\n"
+#, fuzzy, priority:100
+#| msgid "Boolean false literals are `no`, `off`, `false`,"
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
+msgstr "Os falsos literais booleanos são `no`, `off`, `false`,"
#. type: Plain text
#: en/config.txt:254
@@ -2891,12 +2878,7 @@ msgstr "ISO 8601"
#: en/date-formats.txt:26
#, priority:280
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
-msgstr ""
-"A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por "
-"exemplo. O analisador também aceita um espaço em vez do caractere `T`. O "
-"analisador aceita um espaço em vez do caractere `T` também. As partes "
-"fracionadas de um segundo serão ignoradas, logo `2005-04-07T22:13:13.019` "
-"por exemplo, será tratada como `2005-04-07T22:13:13`."
+msgstr "A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por exemplo. O analisador também aceita um espaço em vez do caractere `T`. O analisador aceita um espaço em vez do caractere `T` também. As partes fracionadas de um segundo serão ignoradas, logo `2005-04-07T22:13:13.019` por exemplo, será tratada como `2005-04-07T22:13:13`."
#. type: Plain text
#: en/date-formats.txt:28
@@ -3390,12 +3372,7 @@ msgstr "Gerando a correção em um formato texto com a opção `-p`"
#: en/diff-generate-patch.txt:15
#, priority:260
msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
-msgstr ""
-"Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], "
-"linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-"
-"files[1] com a opção `-p` produz um patch em formato texto. É possível "
-"personalizar a criação do patch em um formato texto através das variáveis de "
-"ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS` (consulte linkgit:git[1])."
+msgstr "Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-files[1] com a opção `-p` produz um patch em formato texto. É possível personalizar a criação do patch em um formato texto através das variáveis de ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS` (consulte linkgit:git[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:18
@@ -4717,14 +4694,7 @@ msgstr "--abrev[=<n>]"
#: en/diff-options.txt:454
#, priority:280
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=<n>`."
-msgstr ""
-"Em vez de exibir o nome completo do objeto hexadecimal com 40 bytes na "
-"produção do formato diff-raw e nas linhas do cabeçalho da árvore diff, exiba "
-"apenas um prefixo parcial. No formato da produção da saída do diff-patch, "
-"a opção `--full-index` tem maior prioridade, ou seja, caso `--full-index` "
-"seja especificado o nome completo da bolha será exibido independente da "
-"opção `--abbrev`. A quantidade dos dígitos fora do preestabelecido pode ser "
-"especificado através da opção `--abbrev=<n>`."
+msgstr "Em vez de exibir o nome completo do objeto hexadecimal com 40 bytes na produção do formato diff-raw e nas linhas do cabeçalho da árvore diff, exiba apenas um prefixo parcial. No formato da produção da saída do diff-patch, a opção `--full-index` tem maior prioridade, ou seja, caso `--full-index` seja especificado o nome completo da bolha será exibido independente da opção `--abbrev`. A quantidade dos dígitos fora do preestabelecido pode ser especificado através da opção `--abbrev=<n>`."
#. type: Labeled list
#: en/diff-options.txt:455
@@ -5090,14 +5060,7 @@ msgstr "--no-relative"
#: en/diff-options.txt:664
#, 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`."
+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:665 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:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 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
@@ -5587,10 +5550,7 @@ msgstr "--[no-]auto-gc"
#: en/fetch-options.txt:103
#, 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."
+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:104
@@ -5746,11 +5706,7 @@ msgstr "--set-upstream"
#: en/fetch-options.txt:205
#, 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]."
+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:207
@@ -7368,10 +7324,7 @@ msgstr "--cached"
#: en/git-apply.txt:76
#, priority:100
msgid "Apply the patch to just the index, without touching the working tree. If `--check` is in effect, merely check that it would apply cleanly to the index entry."
-msgstr ""
-"Aplica o patch apenas no índice sem afetar a árvore de trabalho. Caso a "
-"opção `--check` esteja em vigor, basta verificar se ele se aplicaria de "
-"forma limpa à entrada do índice."
+msgstr "Aplica o patch apenas no índice sem afetar a árvore de trabalho. Caso a opção `--check` esteja em vigor, basta verificar se ele se aplicaria de forma limpa à entrada do índice."
#. type: Plain text
#: en/git-apply.txt:84
@@ -8309,8 +8262,7 @@ msgid ""
" git bisect help\n"
msgstr ""
" git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n"
-"\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
-"[<paths>...]\n"
+"\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n"
" git bisect (bad|new|<novo-termo>) [<rev>]\n"
" git bisect (good|old|<termo-antigo>) [<rev>...]\n"
" git bisect terms [--term-good | --term-bad]\n"
@@ -9560,10 +9512,8 @@ msgstr ""
"\t[--points-at <objeto>] [--format=<formato>]\n"
"\t[(-r | --remotes) | (-a | --all)]\n"
"\t[--list] [<padrão>...]\n"
-"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]"
-"\n"
-"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]"
-"\n"
+"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]\n"
+"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n"
"'git branch' --unset-upstream [<nome-do-ramo>]\n"
"'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n"
"'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n"
@@ -9964,10 +9914,7 @@ msgstr "--merged [<commit>]"
#: en/git-branch.txt:256
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as ramificações cujas dicas são acessíveis a partir do commit "
-"informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção "
-"`--list`."
+msgstr "Liste apenas as ramificações cujas dicas são acessíveis a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`."
#. type: Labeled list
#: en/git-branch.txt:257 en/git-tag.txt:154
@@ -9979,10 +9926,7 @@ msgstr "--no-merged [<commit>]"
#: en/git-branch.txt:260
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as ramificações cujas dicas não possam ser acessadas a partir "
-"do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da "
-"opção `--list`."
+msgstr "Liste apenas as ramificações cujas dicas não possam ser acessadas a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`."
#. type: Labeled list
#: en/git-branch.txt:261
@@ -10167,7 +10111,7 @@ msgid "Patterns will normally need quoting."
msgstr "Os padrões normalmente precisam ser citados."
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr "OBSERVAÇÕES"
@@ -10338,10 +10282,7 @@ msgstr "--suffix <formato>"
#: en/git-bugreport.txt:51
#, priority:100
msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
-msgstr ""
-"Defina um sufixo alternativo para o nome do relatório de erros, para criar "
-"um arquivo com o nome de 'git-bugreport-<sufixo formatado>'. Isso deve "
-"assumir a forma compatível com strftime(3) ; a hora local será utilizada."
+msgstr "Defina um sufixo alternativo para o nome do relatório de erros, para criar um arquivo com o nome de 'git-bugreport-<sufixo formatado>'. Isso deve assumir a forma compatível com strftime(3) ; a hora local será utilizada."
#. type: Title =
#: en/git-bundle.txt:2
@@ -10365,8 +10306,7 @@ msgid ""
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
-"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-"
-"progress-implied]\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]\n"
"\t\t [--version=<versão>] <arquivo> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <arquivo>\n"
"'git bundle' list-heads <arquivo> [<refname>...]\n"
@@ -10725,10 +10665,8 @@ msgid ""
"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
msgstr ""
-"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -"
-"p | <tipo> | --textconv | --filters ) [--path=<caminho>] <objeto>\n"
-"'git cat-file' (--batch[=<formato>] | --batch-check[=<formato>]) [ --"
-"textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <tipo> | --textconv | --filters ) [--path=<caminho>] <objeto>\n"
+"'git cat-file' (--batch[=<formato>] | --batch-check[=<formato>]) [ --textconv | --filters ] [--follow-symlinks]\n"
#. type: Plain text
#: en/git-cat-file.txt:21
@@ -14220,18 +14158,13 @@ msgid ""
msgstr ""
"*OBSERVAÇÃO*: provavelmente está uma operação muito perigosa; *não*\n"
"utilize a menos que compreenda o que ela faz. Caso clone o seu\n"
-"repositório utilizando esta opção e em seguida exclua os ramos (ou use "
-"qualquer\n"
+"repositório utilizando esta opção e em seguida exclua os ramos (ou use qualquer\n"
"outro comando Git que faz qualquer commit existente perder a referência) no\n"
-"repositório da origem, alguns objetos podem perder a referência (ou ficarem "
-"soltos).\n"
-"Estes objetos podem ser removidos através das operações normais do Git ("
-"como\n"
-"`git commit`) que chama automaticamente o comando `git maintenance run "
-"--auto`.\n"
+"repositório da origem, alguns objetos podem perder a referência (ou ficarem soltos).\n"
+"Estes objetos podem ser removidos através das operações normais do Git (como\n"
+"`git commit`) que chama automaticamente o comando `git maintenance run --auto`.\n"
"(Consulte linkgit:git-maintenance[1].) Caso estes objetos sejam removidos\n"
-"e foram referenciados pelo repositório clonado, o repositório clonado se "
-"tornará corrompido.\n"
+"e foram referenciados pelo repositório clonado, o repositório clonado se tornará corrompido.\n"
#. type: Plain text
#: en/git-clone.txt:90
@@ -16165,8 +16098,7 @@ msgstr "--unset-all"
#: en/git-config.txt:163
#, 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."
+msgstr "Remove do arquivo de configuração todas as linhas que correspondam à chave."
#. type: Plain text
#: en/git-config.txt:167
@@ -17770,16 +17702,11 @@ msgstr "O módulo CVS que deseja importar. Relativo ao <CVSROOT>. Caso não sej
msgid "-C <target-dir>"
msgstr "-C <diretório-de-destino>"
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr "O repositório Git para o qual irá importar. Se o diretório não"
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, fuzzy, priority:100
+#| msgid "exist, it will be created. Default is the current directory.\n"
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr "existir, ele será criado. A predefinição é o diretório atual.\n"
#. type: Labeled list
@@ -19488,11 +19415,7 @@ msgstr "É predefinido que o comando `git description` exiba apenas as tags com
#: en/git-describe.txt:34
#, priority:260
msgid "If the given object refers to a blob, it will be described as `<commit-ish>:<path>`, such that the blob can be found at `<path>` in the `<commit-ish>`, which itself describes the first commit in which this blob occurs in a reverse revision walk from HEAD."
-msgstr ""
-"Caso o objeto especificado se refera a uma bolha, este será descrito como "
-"`<commit-ish>:<caminho>`, de modo que a bolha possa ser encontrada em "
-"`<caminho>` que em si descreve o primeiro commit no qual essa bolha ocorre "
-"em uma revisão reversa do `HEAD`."
+msgstr "Caso o objeto especificado se refera a uma bolha, este será descrito como `<commit-ish>:<caminho>`, de modo que a bolha possa ser encontrada em `<caminho>` que em si descreve o primeiro commit no qual essa bolha ocorre em uma revisão reversa do `HEAD`."
#. type: Labeled list
#: en/git-describe.txt:37
@@ -19758,11 +19681,7 @@ msgstr "No caso várias tags serem localizadas durante o procedimento, será sel
#: en/git-describe.txt:204
#, 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."
+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."
#. type: Title =
#: en/git-diff-files.txt:2
@@ -20530,11 +20449,7 @@ msgstr ""
#: en/git-diff.txt:25
#, priority:280
msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
-msgstr ""
-"Exibe as alterações entre a árvore de trabalho, o índice ou uma árvore, as "
-"alterações entre o índice e uma árvore, as alterações entre as duas árvores, "
-"nas alterações resultantes de uma mesclagem, nas alterações entre dois "
-"objetos bolha ou nas alterações entre dois arquivos no disco."
+msgstr "Exibe as alterações entre a árvore de trabalho, o índice ou uma árvore, as alterações entre o índice e uma árvore, as alterações entre as duas árvores, nas alterações resultantes de uma mesclagem, nas alterações entre dois objetos bolha ou nas alterações entre dois arquivos no disco."
#. type: Labeled list
#: en/git-diff.txt:26
@@ -20618,10 +20533,7 @@ msgstr "'git diff' [<opções>] <commit>..<commit> [--] [<caminho>...]"
#: en/git-diff.txt:81
#, 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`."
+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:82
@@ -20657,9 +20569,7 @@ msgstr "'git diff' [<opções>] <blob> <blob>"
#: en/git-diff.txt:106
#, 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."
+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:120
@@ -20855,9 +20765,7 @@ msgstr "Saída do diff em reverso."
#: en/git-diff.txt:213
#, 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]"
+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]"
#. type: Title =
#: en/git-fast-export.txt:2
@@ -21457,16 +21365,11 @@ msgstr "--rewrite-submodules-from=<nome>:<arquivo>"
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<nome>:<arquivo>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr "Reescreva as IDs dos objetos para o submódulo definido pelo <nome> vindo dos valores"
-
#. type: Plain text
#: en/git-fast-import.txt:134
-#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+#, fuzzy, priority:100
+#| msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr "usado vindo de um <arquivo> para aqueles usado para o <arquivo>. As marcações de origem deveriam ter sido criadas por pelo comando `git fast-export` e as marcações to deveriam ter sido criadas pelo ` git fast-import` durante a importação do mesmo submódulo."
#. type: Plain text
@@ -21707,10 +21610,7 @@ msgstr "Caso uma compensação local não esteja disponível no material de orig
#: en/git-fast-import.txt:298
#, priority:100
msgid "Unlike the `rfc2822` format, this format is very strict. Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
-msgstr ""
-"Diferente do formato `rfc2822`, que é muito rigoroso. Qualquer variação na "
-"formatação fará com que o fast-import rejeite o valor e algumas verificações "
-"de sanidade com valores numéricos também possam ser executadas."
+msgstr "Diferente do formato `rfc2822`, que é muito rigoroso. Qualquer variação na formatação fará com que o fast-import rejeite o valor e algumas verificações de sanidade com valores numéricos também possam ser executadas."
#. type: Labeled list
#: en/git-fast-import.txt:299
@@ -22562,9 +22462,7 @@ msgstr "\t'original-oid' SP <identificador-do-objeto> LF\n"
#: en/git-fast-import.txt:818
#, priority:100
msgid "where `<object-identifier>` is any string not containing LF."
-msgstr ""
-"onde `<identificador-do-objeto>` é qualquer cadeia de caracteres que não "
-"contenha LF."
+msgstr "onde `<identificador-do-objeto>` é qualquer cadeia de caracteres que não contenha LF."
#. type: Plain text
#: en/git-fast-import.txt:823
@@ -23375,21 +23273,19 @@ msgid "M 777 inline bob\n"
msgstr "M 777 inline bob\n"
#. type: delimited block =
-#: en/git-fast-import.txt:1320
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:1321
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "Active Branch LRU\n"
+#| "-----------------\n"
msgid ""
"Active Branch LRU\n"
"-----------------\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
"Ramo Ativo LRU\n"
"--------------\n"
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
-msgstr "active_branches = 1 cur, 5 max\n"
-
#. type: delimited block =
#: en/git-fast-import.txt:1324
#, priority:100
@@ -23403,21 +23299,19 @@ msgid "0 refs/heads/master"
msgstr "0 refs/heads/master"
#. type: delimited block =
-#: en/git-fast-import.txt:1329
-#, no-wrap, priority:100
+#: en/git-fast-import.txt:1335
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "status : active loaded dirty\n"
+#| "tip commit : 0000000000000000000000000000000000000000\n"
+#| "old tree : 0000000000000000000000000000000000000000\n"
+#| "cur tree : 0000000000000000000000000000000000000000\n"
+#| "commit clock: 0\n"
+#| "last pack :\n"
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-"Ramos Inativos\n"
-"--------------\n"
-"refs/heads/master:\n"
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -23986,10 +23880,7 @@ msgstr "Os nomes dos `refs` que são capturados, juntamente com os nomes dos obj
#: en/git-fetch.txt:54
#, priority:220
msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported."
-msgstr ""
-"Faz a leitura linha a linha dos refspecs a partir do stdin adicionalmente "
-"aqueles fornecidos pelos argumentos. O formato \"tag <nome>\" não é "
-"compatível."
+msgstr "Faz a leitura linha a linha dos refspecs a partir do stdin adicionalmente aqueles fornecidos pelos argumentos. O formato \"tag <nome>\" não é compatível."
#. type: Title -
#: en/git-fetch.txt:59
@@ -24381,18 +24272,13 @@ msgstr "$ git fetch origin +seen:seen maint:tmp\n"
#: en/git-fetch.txt:268
#, priority:220
msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository."
-msgstr ""
-"Faz a atualização (ou cria, conforme seja necessário) as ramificações `seen` "
-"e `tmp` no repositório local, capturando as ramificações (respectivamente) "
-"`seen` e `maint` no repositório remoto."
+msgstr "Faz a atualização (ou cria, conforme seja necessário) as ramificações `seen` e `tmp` no repositório local, capturando as ramificações (respectivamente) `seen` e `maint` no repositório remoto."
#. type: Plain text
#: en/git-fetch.txt:271
#, priority:220
msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
-msgstr ""
-"O ramo `seen` será atualizado ainda que não faça um avanço rápido, porque é "
-"prefixado com um sinal de mais; já o `tmp` não será."
+msgstr "O ramo `seen` será atualizado ainda que não faça um avanço rápido, porque é prefixado com um sinal de mais; já o `tmp` não será."
#. type: Plain text
#: en/git-fetch.txt:274
@@ -25624,9 +25510,7 @@ msgstr "--merged[=<objeto>]"
#: en/git-for-each-ref.txt:80
#, priority:100
msgid "Only list refs whose tips are reachable from the specified commit (HEAD if not specified)."
-msgstr ""
-"Liste apenas as referências cujas dicas são acessíveis a partir do commit "
-"especificado (ou HEAD caso nenhum seja especificado)."
+msgstr "Liste apenas as referências cujas dicas são acessíveis a partir do commit especificado (ou HEAD caso nenhum seja especificado)."
#. type: Labeled list
#: en/git-for-each-ref.txt:81
@@ -25638,9 +25522,7 @@ msgstr "--no-merged[=<objeto>]"
#: en/git-for-each-ref.txt:84
#, priority:100
msgid "Only list refs whose tips are not reachable from the specified commit (HEAD if not specified)."
-msgstr ""
-"Liste apenas as referências cujas dicas não podem ser acessadas a partir do "
-"commit especificado (ou HEAD caso nenhum seja especificado)."
+msgstr "Liste apenas as referências cujas dicas não podem ser acessadas a partir do commit especificado (ou HEAD caso nenhum seja especificado)."
#. type: Labeled list
#: en/git-for-each-ref.txt:85
@@ -25862,12 +25744,7 @@ msgstr "O caminho absoluto para a árvore de trabalho onde a \"ref\" foi averigu
#: en/git-for-each-ref.txt:225
#, priority:100
msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. Fields `tree` and `parent` can also be used with modifier `:short` and `:short=<length>` just like `objectname`."
-msgstr ""
-"Além do que foi dito acima para os objetos commit e tag, os nomes dos campos "
-"do cabeçalho (`tree`, `parent`, `object`, `type`, e `tag`) podem ser "
-"utilizados para especificar o valor no campo do cabeçalho. Os campos `tree` "
-"e `parent` também podem ser utilizado com um modificador `:short` e "
-"`:short=<comprimento>` assim como `objectname`."
+msgstr "Além do que foi dito acima para os objetos commit e tag, os nomes dos campos do cabeçalho (`tree`, `parent`, `object`, `type`, e `tag`) podem ser utilizados para especificar o valor no campo do cabeçalho. Os campos `tree` e `parent` também podem ser utilizado com um modificador `:short` e `:short=<comprimento>` assim como `objectname`."
#. type: Plain text
#: en/git-for-each-ref.txt:230
@@ -25879,13 +25756,7 @@ msgstr "Para os objetos commit e tag, os campos especiais `creatordate` e `creat
#: en/git-for-each-ref.txt:237
#, priority:100
msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component. For email fields (`authoremail`, `committeremail` and `taggeremail`), `:trim` can be appended to get the email without angle brackets, and `:localpart` to get the part before the `@` symbol out of the trimmed email."
-msgstr ""
-"Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`"
-", `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` "
-"para extrair o componente informado. Para campos do email (`authoremail`, "
-"`committeremail` e `taggeremail`), o `:trim` pode ser anexado para obter o e-"
-"mail sem os colchetes e`:localpart` para obter a parte antes do símbolo `@` "
-"do endereço do e-mail."
+msgstr "Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`, `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` para extrair o componente informado. Para campos do email (`authoremail`, `committeremail` e `taggeremail`), o `:trim` pode ser anexado para obter o e-mail sem os colchetes e`:localpart` para obter a parte antes do símbolo `@` do endereço do e-mail."
#. type: Plain text
#: en/git-for-each-ref.txt:240
@@ -25957,15 +25828,7 @@ msgstr "As primeiras `N` linhas da mensagem."
#: en/git-for-each-ref.txt:268
#, priority:100
msgid "Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
-msgstr ""
-"Além disso, os trailers interpretados através do linkgit:git-interpret-"
-"trailers[1] são obtidos como `caractere de resposta` (ou utilizando o alias "
-"do histórico `contents:trailers`). As linhas que não forem caractere de "
-"resposta do bloco dos caracteres de resposta, podem ser omitidos com "
-"`trailers:only`. As continuações dos espaços podem ser removidos dos "
-"caracteres de resposta, para que cada caractere apareça em uma linha por si "
-"só e com o seu conteúdo completo, utilizando `trailers:unfold`. Ambos podem "
-"ser utilizados juntos como `trailers:unfold,only`."
+msgstr "Além disso, os trailers interpretados através do linkgit:git-interpret-trailers[1] são obtidos como `caractere de resposta` (ou utilizando o alias do histórico `contents:trailers`). As linhas que não forem caractere de resposta do bloco dos caracteres de resposta, podem ser omitidos com `trailers:only`. As continuações dos espaços podem ser removidos dos caracteres de resposta, para que cada caractere apareça em uma linha por si só e com o seu conteúdo completo, utilizando `trailers:unfold`. Ambos podem ser utilizados juntos como `trailers:unfold,only`."
#. type: Plain text
#: en/git-for-each-ref.txt:272
@@ -26985,10 +26848,13 @@ msgstr "Faz sentido para mim. Que tal este patch?\n"
#. type: delimited block -
#: en/git-format-patch.txt:430
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "-- >8 --\n"
+#| "Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
"-> 8 -\n"
"Assunto: [IA64] Coloque os arquivos da configuração do ia64 na dieta Uwe Kleine-König\n"
@@ -28503,11 +28369,7 @@ msgstr "Abra os arquivos coincidentes no pager (não a saída do 'grep'). Caso
#: en/git-grep.txt:213
#, priority:100
msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
-msgstr ""
-"Use '\\0' como um delimitador para os nomes do caminho na saída, e as "
-"imprima literalmente. Sem esta opção, os nomes do caminho com caracteres "
-"\"incomuns\" são citados como explicado na variável de configuração `core."
-"quotePath` (consulte linkgit:git-config[1])."
+msgstr "Use '\\0' como um delimitador para os nomes do caminho na saída, e as imprima literalmente. Sem esta opção, os nomes do caminho com caracteres \"incomuns\" são citados como explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/git-grep.txt:215
@@ -29193,9 +29055,7 @@ msgstr "Caso a opção `--all` ou `-a` seja utilizada, todos os comandos dispon
#: en/git-help.txt:26
#, priority:100
msgid "If the option `--guides` or `-g` is given, a list of the Git concept guides is also printed on the standard output."
-msgstr ""
-"Caso a opção `--guides` ou `-g` seja utilizada, uma lista do guia de "
-"conceitos do Git também será exibida na saída padrão."
+msgstr "Caso a opção `--guides` ou `-g` seja utilizada, uma lista do guia de conceitos do Git também será exibida na saída padrão."
#. type: Plain text
#: en/git-help.txt:31
@@ -29261,9 +29121,7 @@ msgstr "--guides"
#: en/git-help.txt:63
#, priority:100
msgid "Prints a list of the Git concept guides on the standard output. This option overrides any given command or guide name."
-msgstr ""
-"Exibe uma lista das guias do conceito do Git na saída padrão. Esta opção "
-"substitui qualquer outro comando ou nome da guia."
+msgstr "Exibe uma lista das guias do conceito do Git na saída padrão. Esta opção substitui qualquer outro comando ou nome da guia."
#. type: Labeled list
#: en/git-help.txt:65
@@ -30047,9 +29905,7 @@ msgstr "git-http-fetch - Faça o download de um repositório Git remoto através
#: en/git-http-fetch.txt:13
#, no-wrap, priority:100
msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
-msgstr ""
-"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w nome-do-arquivo] [--recover] "
-"[--stdin | --packfile=<hash> | <commit>] <url>\n"
+msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w nome-do-arquivo] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
#. type: Plain text
#: en/git-http-fetch.txt:17
@@ -30367,9 +30223,7 @@ msgstr "Converse com o servidor IMAP utilizando as próprias rotinas IMAP do git
#: en/git-imap-send.txt:56
#, priority:100
msgid "To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set to appropriate values."
-msgstr ""
-"Para utilizar a ferramenta, o `imap.folder` e o `imap.tunnel` ou o `imap."
-"host` devem ser configurados com os valores apropriados."
+msgstr "Para utilizar a ferramenta, o `imap.folder` e o `imap.tunnel` ou o `imap.host` devem ser configurados com os valores apropriados."
#. type: Plain text
#: en/git-imap-send.txt:62
@@ -30469,9 +30323,7 @@ msgstr ""
#: en/git-imap-send.txt:112
#, priority:100
msgid "You might need to instead use: `folder = \"[Google Mail]/Drafts\"` if you get an error that the \"Folder doesn't exist\"."
-msgstr ""
-"Você pode precisar utilizar: `folder = \"[Google Mail]/Drafts\"` caso receba "
-"um erro indicando que a \"O diretório não existe\"."
+msgstr "Você pode precisar utilizar: `folder = \"[Google Mail]/Drafts\"` caso receba um erro indicando que a \"O diretório não existe\"."
#. type: Plain text
#: en/git-imap-send.txt:116
@@ -30495,11 +30347,7 @@ msgstr " $ git format-patch --cover-letter -M --stdout origin/master | git imap
#: en/git-imap-send.txt:124
#, priority:100
msgid "Just make sure to disable line wrapping in the email client (Gmail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
-msgstr ""
-"Apenas certifique-se de desabilitar a quebra de linha no cliente de email (a "
-"interface da Web do Gmail sempre irá quebrar as linhas independentemente de "
-"qualquer coisa, portanto, você precisará utilizar um cliente IMAP de "
-"verdade)."
+msgstr "Apenas certifique-se de desabilitar a quebra de linha no cliente de email (a interface da Web do Gmail sempre irá quebrar as linhas independentemente de qualquer coisa, portanto, você precisará utilizar um cliente IMAP de verdade)."
#. type: Title -
#: en/git-imap-send.txt:126
@@ -30697,11 +30545,7 @@ msgstr "Esta opção não pode ser utilizada com --stdin."
#: en/git-index-pack.txt:113
#, priority:100
msgid "Once the index has been created, the hash that goes into the name of the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
-msgstr ""
-"Uma vez que o índice seja criado, o hash que vai dentro do nome do arquivo "
-"pack/idx é exibido no stdout. Caso `--stdin` também seja utilizado, então "
-"este é prefixado por \"pack\\t\" ou \"keep\\t\" caso um novo arquivo `.keep` "
-"seja criado com êxito. Isso é útil para remover um"
+msgstr "Uma vez que o índice seja criado, o hash que vai dentro do nome do arquivo pack/idx é exibido no stdout. Caso `--stdin` também seja utilizado, então este é prefixado por \"pack\\t\" ou \"keep\\t\" caso um novo arquivo `.keep` seja criado com êxito. Isso é útil para remover um"
#. type: Block title
#: en/git-index-pack.txt:113
@@ -31955,11 +31799,7 @@ msgstr "Exibe os registros log do commit."
#: en/git-log.txt:25
#, priority:260
msgid "The command takes options applicable to the linkgit:git-rev-list[1] command to control what is shown and how, and options applicable to the linkgit:git-diff[1] command to control how the changes each commit introduces are shown."
-msgstr ""
-"O comando aceita as opções aplicáveis ao comando linkgit:git-rev-list[1] "
-"para controlar o que é exibido e como. As opções aplicáveis ao comando "
-"linkgit:git-diff[1] serve para controlar como as alterações que cada commit "
-"faz são exibidas."
+msgstr "O comando aceita as opções aplicáveis ao comando linkgit:git-rev-list[1] para controlar o que é exibido e como. As opções aplicáveis ao comando linkgit:git-diff[1] serve para controlar como as alterações que cada commit faz são exibidas."
#. type: Labeled list
#: en/git-log.txt:30
@@ -32127,21 +31967,13 @@ msgstr "FORMATAÇÃO DIFF"
#: en/git-log.txt:122
#, 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."
+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:129
#, priority:260
msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never 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 merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)."
-msgstr ""
-"Observe que a menos que uma das opções `-c`, `--cc` ou `-m` sejam usadas, os "
-"commits mesclados nunca mostrarão um diff, mesmo que um formato diff como "
-"`--patch` seja escolhido, sequer eles corresponderão às opções de pesquisa "
-"como `-S`. A exceção é quando a opção `--first-parent` estiver em uso, onde "
-"as mesclagens são tratadas como simples commits normais (isso pode ser "
-"substituído usando uma opção combinada com diff ou com `--no-diff-merges`)."
+msgstr "Observe que a menos que uma das opções `-c`, `--cc` ou `-m` sejam usadas, os commits mesclados nunca mostrarão um diff, mesmo que um formato diff como `--patch` seja escolhido, sequer eles corresponderão às opções de pesquisa como `-S`. A exceção é quando a opção `--first-parent` estiver em uso, onde as mesclagens são tratadas como simples commits normais (isso pode ser substituído usando uma opção combinada com diff ou com `--no-diff-merges`)."
#. type: Plain text
#: en/git-log.txt:136
@@ -32177,9 +32009,7 @@ msgstr "--no-diff-merges"
#: en/git-log.txt:162
#, priority:260
msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`."
-msgstr ""
-"Desativa a saída dos diffs para a mesclagem dos commits (padrão). Útil para "
-"substituir '-m', '-c', ou '--cc'."
+msgstr "Desativa a saída dos diffs para a mesclagem dos commits (padrão). Útil para substituir '-m', '-c', ou '--cc'."
#. type: Labeled list
#: en/git-log.txt:170
@@ -33333,12 +33163,7 @@ msgstr "Copie o cabeçalho da ID da mensagem no final da mensagem do commit. É
#: en/git-mailinfo.txt:81
#, priority:100
msgid "Remove everything in body before a scissors line (e.g. \"-- >8 --\"). The line represents scissors and perforation marks, and is used to request the reader to cut the message at that line. If that line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
-msgstr ""
-"Remove tudo do corpo da mensagem antes das marcações (por exemplo \"-- >8 --"
-"\"). A linha representa cortes e marcas de perfuração utilizada para pedir "
-"ao leitor que corte a mensagem bem nessa linha. Caso esta linha apareça no "
-"corpo da mensagem antes do patch, tudo o que estiver à frente (incluindo a "
-"própria linha) será ignorado quando essa opção for utilizada."
+msgstr "Remove tudo do corpo da mensagem antes das marcações (por exemplo \"-- >8 --\"). A linha representa cortes e marcas de perfuração utilizada para pedir ao leitor que corte a mensagem bem nessa linha. Caso esta linha apareça no corpo da mensagem antes do patch, tudo o que estiver à frente (incluindo a própria linha) será ignorado quando essa opção for utilizada."
#. type: Plain text
#: en/git-mailinfo.txt:86
@@ -35636,16 +35461,7 @@ msgstr "Quando mesclar as anotações, seja loquaz. Quando remover as anotaçõ
#: en/git-notes.txt:229
#, ignore-ellipsis, priority:100
msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message). These blobs are taken from notes refs. A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
-msgstr ""
-"As anotações dos commits são bolhas que contêm informações extras sobre um "
-"objeto (geralmente informações para complementar a mensagem de um commit). "
-"Estas bolhas são retiradas das anotações refs. Uma anotação \"ref\" "
-"geralmente é um ramo que contém \"arquivos\" cujos caminhos são os nomes dos "
-"objetos que o descrevem, com alguns separadores do diretório incluídos por "
-"motivos de desempenho, nota de rodapé: [Os nomes dos caminhos permitidos têm "
-"o formato `'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...'`: uma sequência com os "
-"nomes dos diretórios com dois dígitos hexadecimais cada um, seguido por um "
-"nome do arquivo com o resto do ID do objeto.]."
+msgstr "As anotações dos commits são bolhas que contêm informações extras sobre um objeto (geralmente informações para complementar a mensagem de um commit). Estas bolhas são retiradas das anotações refs. Uma anotação \"ref\" geralmente é um ramo que contém \"arquivos\" cujos caminhos são os nomes dos objetos que o descrevem, com alguns separadores do diretório incluídos por motivos de desempenho, nota de rodapé: [Os nomes dos caminhos permitidos têm o formato `'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...'`: uma sequência com os nomes dos diretórios com dois dígitos hexadecimais cada um, seguido por um nome do arquivo com o resto do ID do objeto.]."
#. type: Plain text
#: en/git-notes.txt:236
@@ -37807,31 +37623,19 @@ msgstr "Uma opção de depuração para ajudar no desenvolvimento futuro do \"cl
#: en/git-pack-objects.txt:276
#, priority:100
msgid "The form '--missing=error' requests that pack-objects stop with an error if a missing object is encountered. If the repository is a partial clone, an attempt to fetch missing objects will be made before declaring them missing. This is the default action."
-msgstr ""
-"A opção `--missing=error` solicita que os objetos do pacote parem com um "
-"erro caso um objeto perdido seja encontrado. Caso o repositório seja um "
-"clone parcial, uma tentativa será feita para buscar os objetos desaparecidos "
-"antes de declará-los como desaparecidos. Esta é a ação predefinida."
+msgstr "A opção `--missing=error` solicita que os objetos do pacote parem com um erro caso um objeto perdido seja encontrado. Caso o repositório seja um clone parcial, uma tentativa será feita para buscar os objetos desaparecidos antes de declará-los como desaparecidos. Esta é a ação predefinida."
#. type: Plain text
#: en/git-pack-objects.txt:280
#, priority:100
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. No fetch of a missing object will occur. Missing objects will silently be omitted from the results."
-msgstr ""
-"O formulário '--missing=allow-any' permitirá que a travessia do objeto "
-"continue caso um objeto ausente seja encontrado. Não ocorrerá nenhuma busca "
-"em um objeto ausente. Os objetos ausentes serão omitidos silenciosamente "
-"dos resultados."
+msgstr "O formulário '--missing=allow-any' permitirá que a travessia do objeto continue caso um objeto ausente seja encontrado. Não ocorrerá nenhuma busca em um objeto ausente. Os objetos ausentes serão omitidos silenciosamente dos resultados."
#. type: Plain text
#: en/git-pack-objects.txt:285
#, priority:100
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. No fetch of a missing object will occur. An unexpected missing object will raise an error."
-msgstr ""
-"A opção '--missing=allow-promisor' é como um `allow-any`, porém só será "
-"permitido que a travessia dos objetos continue para os objetos ausentes que "
-"forem PREVISTOS. Não ocorrerá nenhuma busca em um objeto ausente. Um objeto "
-"que se perdeu de forma inesperada irão provocar um erro."
+msgstr "A opção '--missing=allow-promisor' é como um `allow-any`, porém só será permitido que a travessia dos objetos continue para os objetos ausentes que forem PREVISTOS. Não ocorrerá nenhuma busca em um objeto ausente. Um objeto que se perdeu de forma inesperada irão provocar um erro."
#. type: Labeled list
#: en/git-pack-objects.txt:286 en/rev-list-options.txt:941
@@ -40883,11 +40687,7 @@ msgstr "Interrompa a operação de reconstrução, porém o `HEAD` não será re
#: en/git-rebase.txt:267
#, priority:100
msgid "Use applying strategies to rebase (calling `git-am` internally). This option may become a no-op in the future once the merge backend handles everything the apply one does."
-msgstr ""
-"Utilize estratégias para aplicar a reestruturação da base \"rebase\" ("
-"invocando `git-am` internamente). Esta opção poderá se tornar não "
-"operacional no futuro uma vez que o processo interno da mesclagem processe "
-"tudo o que a opção '--apply' fizer."
+msgstr "Utilize estratégias para aplicar a reestruturação da base \"rebase\" (invocando `git-am` internamente). Esta opção poderá se tornar não operacional no futuro uma vez que o processo interno da mesclagem processe tudo o que a opção '--apply' fizer."
#. type: Labeled list
#: en/git-rebase.txt:270
@@ -41169,18 +40969,13 @@ msgstr ""
#: en/git-rebase.txt:482
#, priority:100
msgid "This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
-msgstr ""
-"Esta opção é repassada para o comando 'git apply' que aplica o patch ("
-"consulte linkgit:git-apply[1]). Implica no uso da opção --apply."
+msgstr "Esta opção é repassada para o comando 'git apply' que aplica o patch (consulte linkgit:git-apply[1]). Implica no uso da opção --apply."
#. type: Plain text
#: en/git-rebase.txt:489
#, priority:100
msgid "Instead of using the current time as the committer date, use the author date of the commit being rebased as the committer date. This option implies `--force-rebase`."
-msgstr ""
-"Em vez de usar a hora atual como a data de quem fez o commit, utilize a data "
-"do autor que fez o rebase do commit como a data do commit. Esta opção "
-"implica no uso de `--force-rebase`."
+msgstr "Em vez de usar a hora atual como a data de quem fez o commit, utilize a data do autor que fez o rebase do commit como a data do commit. Esta opção implica no uso de `--force-rebase`."
#. type: Labeled list
#: en/git-rebase.txt:491
@@ -41518,23 +41313,24 @@ msgstr "--keep-base e --root"
msgid "--fork-point and --root"
msgstr "--fork-point e --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr "DIFERENÇAS COMPORTAMENTAIS"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "git rebase has two primary backends: apply and merge. (The apply\n"
+#| "backend used to be known as the 'am' backend, but the name led to\n"
+#| "confusion as it looks like a verb instead of a noun. Also, the merge\n"
+#| "backend used to be known as the interactive backend, but it is now\n"
+#| "used for non-interactive cases as well. Both were renamed based on\n"
+#| "lower-level functionality that underpinned each.) There are some\n"
+#| "subtle differences in how these two backends behave:\n"
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
"O git rebase possui duas estruturas primárias: `apply` e `merge`. (A aplicação\n"
"da estrutura era conhecido como 'am', porém o nome causava\n"
@@ -41544,51 +41340,51 @@ msgstr ""
"funcionalidade de baixo nível que sustentava cada um.) Há algumas\n"
"diferenças sutis em como estes dois processos internos se comportam:\n"
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
-"Commits vazios\n"
-"~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "Git Commits"
+msgid "Empty commits"
+msgstr "Os Commits do Git"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The apply backend unfortunately drops intentionally empty commits, i.e.\n"
+#| "commits that started empty, though these are rare in practice. It\n"
+#| "also drops commits that become empty and has no option for controlling\n"
+#| "this behavior.\n"
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
"A estrutura aplicada infelizmente descarta os commits vazios de forma intencional, ou seja.\n"
"Os commits que começaram vazios, contudo na prática, é algo raro. Também\n"
"descarta os commits que se tornam vazios e não há uma opção para controlar\n"
"este comportamento.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The merge backend keeps intentionally empty commits by default (though\n"
+#| "with -i they are marked as empty in the todo list editor, or they can\n"
+#| "be dropped automatically with --no-keep-empty).\n"
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
"É predefinido que a estrutura da mesclagem mantenha os commits\n"
"intencionalmente vazios (com `-i` são marcados como vazio no editor da lista de tarefas,\n"
"ou podem ser descartados automaticamente com a opção `--no-keep-empty`).\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "Similar to the apply backend, by default the merge backend drops\n"
+#| "commits that become empty unless -i/--interactive is specified (in\n"
+#| "which case it stops and asks the user what to do). The merge backend\n"
+#| "also has an --empty={drop,keep,ask} option for changing the behavior\n"
+#| "of handling commits that become empty.\n"
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
"Semelhante à estrutura aplicada, é predefinido que\n"
"a estrutura da mesclagem derrube os commits que se tornaram vazios,\n"
@@ -41597,28 +41393,30 @@ msgstr ""
"também possui uma opção --empty={drop,keep,ask} para alterar o comportamento\n"
"da manipulação dos commits que ficam vazios.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:696
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:695
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "Directory rename detection\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
"Detecção da renomeação do diretório\n"
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "Due to the lack of accurate tree information (arising from\n"
+#| "constructing fake ancestors with the limited information available in\n"
+#| "patches), directory rename detection is disabled in the apply backend.\n"
+#| "Disabled directory rename detection means that if one side of history\n"
+#| "renames a directory and the other adds new files to the old directory,\n"
+#| "then the new files will be left behind in the old directory without\n"
+#| "any warning at the time of rebasing that you may want to move these\n"
+#| "files into the new directory.\n"
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
"Devido à falta de informações precisas sobre as árvores (que surge de\n"
"construções dos ancestrais falsos com informações limitadas disponíveis nos\n"
@@ -41629,44 +41427,43 @@ msgstr ""
"durante a reconstrução onde você possa talvez querer mover estes arquivos, \n"
"para o novo diretório.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "Directory rename detection works with the merge backend to provide you\n"
+#| "warnings in such cases.\n"
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
"A detecção da renomeação do diretório funciona com a estrutura da mesclagem,\n"
"neste caso, fornecendo informações para você.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
-"Contexto\n"
-"~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The apply backend works by creating a sequence of patches (by calling\n"
+#| "`format-patch` internally), and then applying the patches in sequence\n"
+#| "(calling `am` internally). Patches are composed of multiple hunks,\n"
+#| "each with line numbers, a context region, and the actual changes. The\n"
+#| "line numbers have to be taken with some fuzz, since the other side\n"
+#| "will likely have inserted or deleted lines earlier in the file. The\n"
+#| "context region is meant to help find how to adjust the line numbers in\n"
+#| "order to apply the changes to the right lines. However, if multiple\n"
+#| "areas of the code have the same surrounding lines of context, the\n"
+#| "wrong one can be picked. There are real-world cases where this has\n"
+#| "caused commits to be reapplied incorrectly with no conflicts reported.\n"
+#| "Setting diff.context to a larger value may prevent such types of\n"
+#| "problems, but increases the chance of spurious conflicts (since it\n"
+#| "will require more lines of matching context to apply).\n"
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
"A aplicação da estrutura funciona ao criar uma sequencia de patches (chamando\n"
"o `format-patch` internalmente), então se aplicam os patches em sequência\n"
@@ -41683,40 +41480,43 @@ msgstr ""
"estes tipos de problemas ocorram, porém aumenta a chance de conflitos espúrios (uma vez que\n"
"exigirá mais linhas que coincidam com o contexto para serem aplicados).\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The merge backend works with a full copy of each relevant file,\n"
+#| "insulating it from these types of problems.\n"
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
"A estrutura da mesclagem trabalha com a cópia completa\n"
"de casa arquivo relevante, isolando-os destes tipos de problemas.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:732
-#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:731
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "Labelling of conflicts markers\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
"Rotulagem dos marcadores de conflitos\n"
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "When there are content conflicts, the merge machinery tries to\n"
+#| "annotate each side's conflict markers with the commits where the\n"
+#| "content came from. Since the apply backend drops the original\n"
+#| "information about the rebased commits and their parents (and instead\n"
+#| "generates new fake commits based off limited information in the\n"
+#| "generated patches), those commits cannot be identified; instead it has\n"
+#| "to fall back to a commit summary. Also, when merge.conflictStyle is\n"
+#| "set to diff3, the apply backend will use \"constructed merge base\" to\n"
+#| "label the content from the merge base, and thus provide no information\n"
+#| "about the merge base commit whatsoever.\n"
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
"Quando há conteúdos conflitantes, o mecanismo da mesclagem tenta\n"
"anotar os marcadores de conflito de cada lado com os commits\n"
@@ -41729,42 +41529,40 @@ msgstr ""
"\"mesclagem reconstruída da base\" para rotular o conteúdo da base mesclada\n"
"e portanto, não fornecer qualquer informações sobre o commit da base mesclada.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The merge backend works with the full commits on both sides of history\n"
+#| "and thus has no such limitations.\n"
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
"A estrutura da mesclagem funciona com commits completos nos dois\n"
"lados da história e portanto, não tem tais limitações.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-"Ganchos\n"
-"~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The apply backend has not traditionally called the post-commit hook,\n"
+#| "while the merge backend has. Both have called the post-checkout hook,\n"
+#| "though the merge backend has squelched its output. Further, both\n"
+#| "backends only call the post-checkout hook with the starting point\n"
+#| "commit of the rebase, not the intermediate commits nor the final\n"
+#| "commit. In each case, the calling of these hooks was by accident of\n"
+#| "implementation rather than by design (both backends were originally\n"
+#| "implemented as shell scripts and happened to invoke other commands\n"
+#| "like 'git checkout' or 'git commit' that would call the hooks). Both\n"
+#| "backends should have the same behavior, though it is not entirely\n"
+#| "clear which, if any, is correct. We will likely make rebase stop\n"
+#| "calling either of these hooks in the future.\n"
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
"A estrutura da aplicação não chama tradicionalmente o gancho pós-commit,\n"
"enquanto a estrutura da mesclagem chama. Ambos chamaram o gancho pós-averiguação,\n"
@@ -41779,27 +41577,29 @@ msgstr ""
"claro qual (caso existam), está correto. Provavelmente faremos a reconstrução (rebase) parar\n"
"chamando um destes ganchos no futuro.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:765
-#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:764
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "Interruptability\n"
+#| "~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
"Interrupção\n"
"~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "The apply backend has safety problems with an ill-timed interrupt; if\n"
+#| "the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
+#| "the rebase can enter a state where it cannot be aborted with a\n"
+#| "subsequent `git rebase --abort`. The merge backend does not appear to\n"
+#| "suffer from the same shortcoming. (See\n"
+#| "https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
+#| "details.)\n"
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
"A aplicação da estrutura possui problemas de segurança relacionada\n"
"com interrupção de tempo; caso o usuário pressione Ctrl+C no momento errado\n"
@@ -41809,26 +41609,24 @@ msgstr ""
"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/\n"
"para obter mais detalhes.)\n"
-#. type: delimited block -
-#: en/git-rebase.txt:776
-#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
-msgstr ""
-"Reformulando o Commit\n"
-"~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:775
+#, fuzzy, no-wrap, priority:100
+#| msgid "Commit Ordering"
+msgid "Commit Rewording"
+msgstr "Ordenando os Commits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "When a conflict occurs while rebasing, rebase stops and asks the user\n"
+#| "to resolve. Since the user may need to make notable changes while\n"
+#| "resolving conflicts, after conflicts are resolved and the user has run\n"
+#| "`git rebase --continue`, the rebase should open an editor and ask the\n"
+#| "user to update the commit message. The merge backend does this, while\n"
+#| "the apply backend blindly applies the original commit message.\n"
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
"Quando ocorre um conflito durante o processo 'rebase', o processo\n"
"para e pergunta ao usuário para resolver o problema. Como o usuário pode precisar fazer muitas alterações enquanto\n"
@@ -41837,49 +41635,53 @@ msgstr ""
"deverá abrir o editor e perguntar ao usuário para atualizar a mensagem do commit. A estrutura da mesclagem faz isso, enquanto\n"
"a estrutura aplica cegamente a mensagem do commit original.\n"
-#. type: delimited block -
-#: en/git-rebase.txt:786
-#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+#. type: Title ~
+#: en/git-rebase.txt:785
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "Miscellaneous differences\n"
+#| "~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
"Diferenças diversas\n"
"~~~~~~~~~~~~~~~~~~~\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "There are a few more behavioral differences that most folks would\n"
+#| "probably consider inconsequential but which are mentioned for\n"
+#| "completeness:\n"
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
"Existem mais algumas diferenças comportamentais que a maioria das\n"
"pessoas considerariam fazer de forma inconsequente, porém são mencionadas\n"
"por questões de integridade:\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "* Reflog: The two backends will use different wording when describing\n"
+#| " the changes made in the reflog, though both will make use of the\n"
+#| " word \"rebase\".\n"
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
"* Reflog: As duas estruturas que utilizarão palavras diferentes durante a descrição\n"
" das alterações feitas no reflog, embora ambos façam a utilização da\n"
" palavra \"rebase\"\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, fuzzy, ignore-ellipsis, priority:100
+#| msgid ""
+#| "* Progress, informational, and error messages: The two backends\n"
+#| " provide slightly different progress and informational messages.\n"
+#| " Also, the apply backend writes error messages (such as \"Your files\n"
+#| " would be overwritten...\") to stdout, while the merge backend writes\n"
+#| " them to stderr.\n"
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
"* Mensagens de progresso, informacionais e de erro: As duas estruturas\n"
" fornecem um progresso ligeiramente diferente das mensagens informantes.\n"
@@ -41887,28 +41689,17 @@ msgstr ""
" serão substituídos...\") para o stdout, enquanto a mesclagem da estrutura escrevem\n"
" eles no stderr.\n"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "* State directories: The two backends keep their state in different\n"
+#| " directories under .git/\n"
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
"* Diretórios de estado: As duas estruturas mantêm a sua condição em diferentes\n"
" diretórios dentro do `.git/`\n"
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr "include::merge-strategies.txt[]\n"
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
-msgstr "OBSERVAÇÕES\n"
-
#. type: Plain text
#: en/git-rebase.txt:812
#, priority:100
@@ -43754,8 +43545,7 @@ msgid ""
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <antigo> <novo>\n"
"'git remote remove' <nome>\n"
"'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n"
@@ -43766,8 +43556,7 @@ msgstr ""
"'git remote set-url --delete' [--push] <nome> <url>\n"
"'git remote' [-v | --verbose] 'show' [-n] <nome>...\n"
"'git remote prune' [-n | --dry-run] <nome>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | "
-"<remoto>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
@@ -43779,9 +43568,7 @@ msgstr "Gerencie o conjunto de repositórios (\"remotos\") cujos ramos você mon
#: en/git-remote.txt:39
#, priority:220
msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
-msgstr ""
-"Seja um pouco mais detalhado e exiba o endereço URL remoto após o nome. "
-"OBSERVAÇÃO: Este deve ser colocado entre `remote` e subcommand."
+msgstr "Seja um pouco mais detalhado e exiba o endereço URL remoto após o nome. OBSERVAÇÃO: Este deve ser colocado entre `remote` e subcommand."
#. type: Plain text
#: en/git-remote.txt:46
@@ -43799,10 +43586,7 @@ msgstr "'add'"
#: en/git-remote.txt:52
#, priority:220
msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgstr ""
-"Adiciona um ramo remoto chamado <nome> para o repositório na <url>. O "
-"comando `git fetch <nome>` pode ser utilizado para criar e atualizar os "
-"ramos monitorados remotamente <nome>/<ramo>."
+msgstr "Adiciona um ramo remoto chamado <nome> para o repositório na <url>. O comando `git fetch <nome>` pode ser utilizado para criar e atualizar os ramos monitorados remotamente <nome>/<ramo>."
#. type: Plain text
#: en/git-remote.txt:55
@@ -43910,25 +43694,13 @@ msgstr "Com `-d` ou `--delete`, a referência simbólica `refs/remotes/<nome>/HE
#: en/git-remote.txt:116
#, priority:220
msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
-msgstr ""
-"Com `-a` ou `--auto`, o ramo remoto é consultado para determinar o seu `HEAD`"
-", então a referência simbólica `refs/remotes/<nome>/HEAD` é definida no "
-"mesmo ramo. Como por exemplo, caso o `HEAD` remoto aponte para `next`, o "
-"comando `git remote set-head origin -a` definirá a referência remota `refs/"
-"remotes/origin/HEAD` para `refs/remotes/origin/next`. Isso só funcionará "
-"caso o `refs/remotes/origin/next` já existir; caso contrário, deve ser "
-"buscado (fetched) primeiro."
+msgstr "Com `-a` ou `--auto`, o ramo remoto é consultado para determinar o seu `HEAD`, então a referência simbólica `refs/remotes/<nome>/HEAD` é definida no mesmo ramo. Como por exemplo, caso o `HEAD` remoto aponte para `next`, o comando `git remote set-head origin -a` definirá a referência remota `refs/remotes/origin/HEAD` para `refs/remotes/origin/next`. Isso só funcionará caso o `refs/remotes/origin/next` já existir; caso contrário, deve ser buscado (fetched) primeiro."
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
-msgstr ""
-"Utilize o `<ramo>` para definir explicitamente a referência simbólica `refs/"
-"remotes/<nome>/HEAD`. Como por exemplo, o comando `git remote set-head "
-"origin master` definirá a referência remota `refs/remotes/origin/HEAD` para `"
-"refs/remotes/origin/master`. Isso só funcionará caso o `refs/remotes/origin/"
-"master` já existir; caso contrário, deve ser buscado (fetched) primeiro."
+msgstr "Utilize o `<ramo>` para definir explicitamente a referência simbólica `refs/remotes/<nome>/HEAD`. Como por exemplo, o comando `git remote set-head origin master` definirá a referência remota `refs/remotes/origin/HEAD` para `refs/remotes/origin/master`. Isso só funcionará caso o `refs/remotes/origin/master` já existir; caso contrário, deve ser buscado (fetched) primeiro."
#. type: Labeled list
#: en/git-remote.txt:123
@@ -43946,9 +43718,7 @@ msgstr "Altera a lista das ramificações monitoradas pelo ramo remoto informado
#: en/git-remote.txt:131
#, priority:220
msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
-msgstr ""
-"Os ramos informados serão interpretados como se fossem definidos com a opção "
-"`-t` na linha de comando `git remote add`."
+msgstr "Os ramos informados serão interpretados como se fossem definidos com a opção `-t` na linha de comando `git remote add`."
#. type: Plain text
#: en/git-remote.txt:134
@@ -44056,9 +43826,7 @@ msgstr "Veja a seção 'PRUNING' do linkgit:git-fetch[1] para saber o que será
#: en/git-remote.txt:186
#, priority:220
msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
-msgstr ""
-"Com a opção `--dry-run`, relate quais os ramos poderão ser eliminados, mas "
-"na verdade não os eliminem."
+msgstr "Com a opção `--dry-run`, relate quais os ramos poderão ser eliminados, mas na verdade não os eliminem."
#. type: Labeled list
#: en/git-remote.txt:187
@@ -44070,13 +43838,7 @@ msgstr "'update'"
#: en/git-remote.txt:195
#, priority:220
msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter `remote.<name>.skipDefaultUpdate` set to true will be updated. (See linkgit:git-config[1])."
-msgstr ""
-"A captura das atualizações remoras ou em grupos remotos no repositório como "
-"definido em `remotes.<grupo>`. Caso nenhum grupo local ou remoto seja "
-"especificado na linha de comandos, o parâmetro `remotes.default` será "
-"utilizado; caso `remotes.default` não esteja definido, todos os remotos que "
-"não possuem o parâmetro da configuração `remote.<nome>.skipDefaultUpdate` "
-"definido como `true` serão atualizados. (Consulte linkgit:git-config[1])."
+msgstr "A captura das atualizações remoras ou em grupos remotos no repositório como definido em `remotes.<grupo>`. Caso nenhum grupo local ou remoto seja especificado na linha de comandos, o parâmetro `remotes.default` será utilizado; caso `remotes.default` não esteja definido, todos os remotos que não possuem o parâmetro da configuração `remote.<nome>.skipDefaultUpdate` definido como `true` serão atualizados. (Consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:197
@@ -49060,9 +48822,7 @@ msgstr "--group=<tipo>"
#: en/git-shortlog.txt:53
#, priority:260
msgid "Group commits based on `<type>`. If no `--group` option is specified, the default is `author`. `<type>` is one of:"
-msgstr ""
-"Grupo dos commits com base no `<tipo>`. Caso nenhuma opção `--group` seja "
-"usada a predefinição é `author`. `<tipo>` é um dos:"
+msgstr "Grupo dos commits com base no `<tipo>`. Caso nenhuma opção `--group` seja usada a predefinição é `author`. `<tipo>` é um dos:"
#. type: Plain text
#: en/git-shortlog.txt:56
@@ -49074,30 +48834,19 @@ msgstr "`author`, os commits são agrupados pelo autor"
#: en/git-shortlog.txt:57
#, priority:260
msgid "`committer`, commits are grouped by committer (the same as `-c`)"
-msgstr ""
-"`committer`, os commits são agrupados por aquele que faz os commits (o mesmo "
-"que `-c`)"
+msgstr "`committer`, os commits são agrupados por aquele que faz os commits (o mesmo que `-c`)"
#. type: Plain text
#: en/git-shortlog.txt:62
#, priority:260
msgid "`trailer:<field>`, the `<field>` is interpreted as a case-insensitive commit message trailer (see linkgit:git-interpret-trailers[1]). For example, if your project uses `Reviewed-by` trailers, you might want to see who has been reviewing with `git shortlog -ns --group=trailer:reviewed-by`."
-msgstr ""
-"`trailer:<campo>`, o `<campo>` é interpretado como um trecho da mensagem do "
-"commit indiferente se for maiúsculas ou minúsculas (consulte linkgit:git-"
-"interpret-trailers[1]). Por exemplo, caso o seu projeto use trechos `"
-"Revisados por` (`Reviewed-by`), é possível ver quem tem feito a revisão "
-"através do comando `git shortlog -ns --group=trailer:reviewed-by`."
+msgstr "`trailer:<campo>`, o `<campo>` é interpretado como um trecho da mensagem do commit indiferente se for maiúsculas ou minúsculas (consulte linkgit:git-interpret-trailers[1]). Por exemplo, caso o seu projeto use trechos `Revisados por` (`Reviewed-by`), é possível ver quem tem feito a revisão através do comando `git shortlog -ns --group=trailer:reviewed-by`."
#. type: Plain text
#: en/git-shortlog.txt:67
#, priority:260
msgid "Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit)."
-msgstr ""
-"Observe que os commits não serão contados caso não incluam os trechos. Da "
-"mesma maneira que os commits com vários trechos (por exemplo, diversos "
-"signoffs) podem ser contados mais de uma vez (porém apenas uma vez com o "
-"valor de um trecho único naquele commit)."
+msgstr "Observe que os commits não serão contados caso não incluam os trechos. Da mesma maneira que os commits com vários trechos (por exemplo, diversos signoffs) podem ser contados mais de uma vez (porém apenas uma vez com o valor de um trecho único naquele commit)."
#. type: Plain text
#: en/git-shortlog.txt:72
@@ -51833,17 +51582,12 @@ msgstr "Atualize os submódulos registrados para que coincidam com o que o super
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr "o commit registrado no superprojeto será"
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
-msgstr "verificado no submódulo em um HEAD desanexado.\n"
+#, fuzzy, priority:220
+#| msgid "the commit recorded in the superproject will be merged"
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
+msgstr "o commit registrado no superprojeto será mesclado"
#. type: Plain text
#: en/git-submodule.txt:156
@@ -51857,29 +51601,19 @@ msgstr "Caso a opção `--force` utilizado, o submódulo será averiguado (utili
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr "a fundação do submódulo do ramo atual será refeito"
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr "no commit registrado no superprojeto.\n"
-
-#. type: Plain text
-#: en/git-submodule.txt:161
-#, priority:220
-msgid "the commit recorded in the superproject will be merged"
-msgstr "o commit registrado no superprojeto será mesclado"
+#, fuzzy, priority:220
+#| msgid "the current branch of the submodule will be rebased"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
+msgstr "a fundação do submódulo do ramo atual será refeito"
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
-msgstr "na ramificação atual no submódulo.\n"
+#, fuzzy, priority:220
+#| msgid "the commit recorded in the superproject will be merged"
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
+msgstr "o commit registrado no superprojeto será mesclado"
#. type: Plain text
#: en/git-submodule.txt:165
@@ -51893,20 +51627,15 @@ msgstr "Os seguintes procedimentos de 'atualização' estão disponíveis apenas
msgid "custom command"
msgstr "comando personalizado"
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr "comando shell arbitrário que utiliza um único"
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, fuzzy, priority:220
+#| msgid ""
+#| "argument (the sha1 of the commit recorded in the\n"
+#| "superproject) is executed. When `submodule.<name>.update`\n"
+#| "is set to '!command', the remainder after the exclamation mark\n"
+#| "is the custom command.\n"
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
"argumento (o sha1 do commit registrado no\n"
"superprojeto) é executado. Quando `submodule.<nome>.update`\n"
@@ -51947,11 +51676,7 @@ msgstr "set-branch (-d|--default) [--] <caminho>"
#: en/git-submodule.txt:187
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
-msgstr ""
-"Define o submódulo como predefinido nos ramos monitorados remotamente. A "
-"opção `--branch` permite que o nome do ramo remoto seja definido. A opção "
-"`--default` remove a chave da configuração `submodule.<nome>.branch`, que "
-"faz com que a predefinição do ramo monitorado seja o 'HEAD' remoto."
+msgstr "Define o submódulo como predefinido nos ramos monitorados remotamente. A opção `--branch` permite que o nome do ramo remoto seja definido. A opção `--default` remove a chave da configuração `submodule.<nome>.branch`, que faz com que a predefinição do ramo monitorado seja o 'HEAD' remoto."
#. type: Labeled list
#: en/git-submodule.txt:188
@@ -52083,13 +51808,7 @@ msgstr "-b <ramo>"
#: en/git-submodule.txt:288
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to the remote 'HEAD'."
-msgstr ""
-"O ramo do repositório para ser adicionado como um submódulo. O nome do ramo "
-"é registrado como `submodule.<nome>.branch` no `.gitmodules` para `update "
-"--remote`. Um valor especial de `.` é utilizado para indicar que o nome do "
-"ramo no submódulo deve ser o mesmo nome como o da ramificação atual, no "
-"repositório atual. Caso a opção não seja utilizada, a predefinição retorna "
-"para o 'HEAD' remoto."
+msgstr "O ramo do repositório para ser adicionado como um submódulo. O nome do ramo é registrado como `submodule.<nome>.branch` no `.gitmodules` para `update --remote`. Um valor especial de `.` é utilizado para indicar que o nome do ramo no submódulo deve ser o mesmo nome como o da ramificação atual, no repositório atual. Caso a opção não seja utilizada, a predefinição retorna para o 'HEAD' remoto."
#. type: Plain text
#: en/git-submodule.txt:301
@@ -52137,14 +51856,7 @@ msgstr "--remote"
#: en/git-submodule.txt:329
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
-msgstr ""
-"Esta opção só é válida para o comando update. Em vez de utilizar o SHA-1 "
-"registrado no superprojeto para atualizar o submódulo, utilize a condição "
-"geral do submódulo do ramo monitorado remotamente. O ramo remoto utilizado "
-"é o ramo (`branch.<nome>.remote`) predefinido para `origin`. O ramo remoto "
-"costumava retornar para o `HEAD` remoto, porém o nome do ramo pode ser "
-"substituído ao definir a opção `submodule.<nome>.branch` ou entre `."
-"gitmodules` ou `.git/config` (onde `.git/config` tem prioridade)."
+msgstr "Esta opção só é válida para o comando update. Em vez de utilizar o SHA-1 registrado no superprojeto para atualizar o submódulo, utilize a condição geral do submódulo do ramo monitorado remotamente. O ramo remoto utilizado é o ramo (`branch.<nome>.remote`) predefinido para `origin`. O ramo remoto costumava retornar para o `HEAD` remoto, porém o nome do ramo pode ser substituído ao definir a opção `submodule.<nome>.branch` ou entre `.gitmodules` ou `.git/config` (onde `.git/config` tem prioridade)."
#. type: Plain text
#: en/git-submodule.txt:335
@@ -54994,17 +54706,13 @@ msgstr "Liste apenas as tags que não contenham nenhum commit em específico (`H
#: en/git-tag.txt:153
#, priority:240
msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
-"Liste apenas as tags cujos commits sejam acessíveis de um determinado commit "
-"(`HEAD`caso não esteja definido)."
+msgstr "Liste apenas as tags cujos commits sejam acessíveis de um determinado commit (`HEAD`caso não esteja definido)."
#. type: Plain text
#: en/git-tag.txt:157
#, priority:240
msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
-"Liste apenas as tags cujos commits não sejam acessíveis em um commit em "
-"específico (`HEAD`caso não esteja definido)."
+msgstr "Liste apenas as tags cujos commits não sejam acessíveis em um commit em específico (`HEAD`caso não esteja definido)."
#. type: Plain text
#: en/git-tag.txt:161
@@ -56172,12 +55880,7 @@ msgstr "`GIT_DEFAULT_HASH`"
#: en/git.txt:509
#, priority:100
msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]."
-msgstr ""
-"Caso esta variável esteja definida, o algoritmo hash predefinido para os "
-"novos repositórios será definido com este valor. Este valor é atualmente "
-"ignorado durante a clonagem; em vez disso, a configuração do repositório "
-"remoto é utilizada. O valor predefinido é `sha1`. ESTA VARIÁVEL É "
-"EXPERIMENTAL! Consulte `--object-format` in linkgit:git-init[1]."
+msgstr "Caso esta variável esteja definida, o algoritmo hash predefinido para os novos repositórios será definido com este valor. Este valor é atualmente ignorado durante a clonagem; em vez disso, a configuração do repositório remoto é utilizada. O valor predefinido é `sha1`. ESTA VARIÁVEL É EXPERIMENTAL! Consulte `--object-format` in linkgit:git-init[1]."
#. type: Title ~
#: en/git.txt:511
@@ -56297,11 +56000,7 @@ msgstr "`GIT_EXTERNAL_DIFF`"
#: en/git.txt:558
#, priority:100
msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called to generate diffs, and Git does not use its builtin diff machinery. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
-msgstr ""
-"Quando a variável de ambiente `GIT_EXTERNAL_DIFF` é configurada, o programa "
-"informado nele é chamado para gerar os diffs, o Git não utiliza o seu "
-"mecanismo diff interno . Para um caminho que é adicionado, removido ou "
-"modificado, a variável `GIT_EXTERNAL_DIFF` é chamado com 7 parâmetros:"
+msgstr "Quando a variável de ambiente `GIT_EXTERNAL_DIFF` é configurada, o programa informado nele é chamado para gerar os diffs, o Git não utiliza o seu mecanismo diff interno . Para um caminho que é adicionado, removido ou modificado, a variável `GIT_EXTERNAL_DIFF` é chamado com 7 parâmetros:"
#. type: Plain text
#: en/git.txt:560
@@ -56321,17 +56020,12 @@ msgstr "onde:"
msgid "<old|new>-file"
msgstr "<old|new>-file"
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr "são os arquivos que `GIT_EXTERNAL_DIFF` pode utilizar para ler o"
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
-msgstr "conteúdo do <antigo|novo>,\n"
+#, fuzzy, priority:100
+#| msgid "are files GIT_EXTERNAL_DIFF can use to read the"
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+msgstr "são os arquivos que `GIT_EXTERNAL_DIFF` pode utilizar para ler o"
#. type: Labeled list
#: en/git.txt:565
@@ -56457,11 +56151,7 @@ msgstr "`GIT_SEQUENCE_EDITOR`"
#: en/git.txt:614
#, priority:100
msgid "This environment variable overrides the configured Git editor when editing the todo list of an interactive rebase. See also linkit::git-rebase[1] and the `sequence.editor` option in linkit::git-config[1]."
-msgstr ""
-"Essa variável de ambiente substitui a configuração do editor Git durante a "
-"edição da lista de tarefas de uma reestruturação interativa da base (rebase)"
-". Veja também linkit::git-rebase[1] e a opção `sequence.editor` em linkit"
-"::git-config[1]."
+msgstr "Essa variável de ambiente substitui a configuração do editor Git durante a edição da lista de tarefas de uma reestruturação interativa da base (rebase). Veja também linkit::git-rebase[1] e a opção `sequence.editor` em linkit::git-config[1]."
#. type: Labeled list
#: en/git.txt:615
@@ -56683,10 +56373,7 @@ msgstr "`GIT_TRACE_REFS`"
#: en/git.txt:728
#, priority:100
msgid "Enables trace messages for operations on the ref database. See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Ativa as mensagens de rastreamento para a operação no banco de dados do "
-"ref. Consulte `GIT_TRACE` para conhecer opções de saída de rastreio "
-"disponíveis."
+msgstr "Ativa as mensagens de rastreamento para a operação no banco de dados do ref. Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
#. type: Labeled list
#: en/git.txt:729
@@ -56722,12 +56409,7 @@ msgstr "`GIT_TRACE_CURL`"
#: en/git.txt:744
#, priority:100
msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol. This is similar to doing curl `--trace-ascii` on the command line. See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Permite um rastreamento curl completo de todos os dados que foram recebidos "
-"e enviados, incluindo as informações descritivas, do protocolo de transporte "
-"git. É semelhante a fazer curl `--trace-ascii` na linha de comando. "
-"Consulte `GIT_TRACE` para conhecer as opções disponíveis geradas pelo "
-"rastreio."
+msgstr "Permite um rastreamento curl completo de todos os dados que foram recebidos e enviados, incluindo as informações descritivas, do protocolo de transporte git. É semelhante a fazer curl `--trace-ascii` na linha de comando. Consulte `GIT_TRACE` para conhecer as opções disponíveis geradas pelo rastreio."
#. type: Labeled list
#: en/git.txt:745
@@ -57185,17 +56867,12 @@ msgstr "Os objetos que já existam no repositório *não* serão descompactados
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr "Para as opções de geração de novos pacotes e reposição dos existentes, consulte linkgit:git-repack[1]."
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr "Ensaio Verifique o arquivo do pacote sem realmente descompactá-lo"
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
-#, priority:100
-msgid "the objects."
-msgstr "os objetos."
+#, fuzzy, priority:100
+#| msgid "Dry run. Check the pack file without actually unpacking"
+msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgstr "Ensaio Verifique o arquivo do pacote sem realmente descompactá-lo"
#. type: Plain text
#: en/git-unpack-objects.txt:37
@@ -57311,17 +56988,12 @@ msgstr "Caso um arquivo especificado estiver no índice, porém esteja ausente,
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr "Examina o índice atual e verifica se as mesclagens são necessárias ou atualizações, verificando as informações do stat()."
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr "Silêncio. Caso a opção `--refresh` descobra que o índice precisa de uma atualização, o comportamento padrão é gerar um erro. Esta opção faz"
-
#. type: Plain text
#: en/git-update-index.txt:63
-#, priority:100
-msgid "'git update-index' continue anyway."
-msgstr "'git update-index' continue mesmo assim."
+#, fuzzy, priority:100
+#| msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
+msgstr "Silêncio. Caso a opção `--refresh` descobra que o índice precisa de uma atualização, o comportamento padrão é gerar um erro. Esta opção faz"
#. type: Labeled list
#: en/git-update-index.txt:64
@@ -57335,23 +57007,12 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr "Não tente atualizar os submódulos. Esta opção é respeitada apenas quando encaminhada antes da opção `--refresh`."
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr "Caso a opção `--refresh` encontre alterações não mescladas no índice, é a predefinição"
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr "o comportamento gerar um erro. Está opção faz 'git update-index'"
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
-msgstr "continue mesmo assim.\n"
+#, fuzzy, priority:100
+#| msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
+msgstr "Silêncio. Caso a opção `--refresh` descobra que o índice precisa de uma atualização, o comportamento padrão é gerar um erro. Esta opção faz"
#. type: Plain text
#: en/git-update-index.txt:75
@@ -58423,14 +58084,7 @@ msgstr "ATUALIZAÇÕES DOS REGISTROS DOS EVENTOS"
#: en/git-update-ref.txt:158
#, priority:100
msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or a pseudoref like HEAD or ORIG_HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value. Log lines are formatted as:"
-msgstr ""
-"Caso o parâmetro de configuração \"core.logAllRefUpdates\" seja verdadeiro e "
-"a \"ref\" for uma no \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\" ou "
-"um pseudo ref como `HEAD` ou `ORIG HEAD`; ou caso o arquivo `$GIT_DIR/logs/"
-"<ref>` existir, o comando `git update-ref` anexará uma linha ao arquivo do "
-"registor log `$GIT_DIR/logs/<ref>` (removendo a referência de todas as "
-"referências simbólicas antes de criar o nome do registro log) descrevendo a "
-"alteração no valor da ref. As linhas do registro log são formatadas como:"
+msgstr "Caso o parâmetro de configuração \"core.logAllRefUpdates\" seja verdadeiro e a \"ref\" for uma no \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\" ou um pseudo ref como `HEAD` ou `ORIG HEAD`; ou caso o arquivo `$GIT_DIR/logs/<ref>` existir, o comando `git update-ref` anexará uma linha ao arquivo do registor log `$GIT_DIR/logs/<ref>` (removendo a referência de todas as referências simbólicas antes de criar o nome do registro log) descrevendo a alteração no valor da ref. As linhas do registro log são formatadas como:"
#. type: Plain text
#: en/git-update-ref.txt:160
@@ -59325,8 +58979,7 @@ msgid ""
"'git worktree repair' [<path>...]\n"
"'git worktree unlock' <worktree>\n"
msgstr ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <novo-ramo>] "
-"<caminho> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <novo-ramo>] <caminho> [<commit-ish>]\n"
"'git worktree list' [--porcelain]\n"
"'git worktree lock' [--reason <texto>] <árvore de trabalho>\n"
"'git worktree move' <árvore de trabalho> <novo caminho>\n"
@@ -59345,16 +58998,7 @@ msgstr "Gerencie várias árvores de trabalho conectadas ao mesmo repositório."
#: en/git-worktree.txt:34
#, priority:240
msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1]. A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
-msgstr ""
-"Um repositório git é compatível com várias árvores de trabalho, permitindo "
-"que você verifique mais de um ramo por vez. Com o `git worktree add`, uma "
-"nova árvore de trabalho é associada ao repositório. Esta nova árvore de "
-"trabalho é chamada de \"árvore de trabalho vinculada\" em oposição à \"árvore"
-" de trabalho principal\" preparada através do comando linkgit:git-init[1] ou "
-"linkgit:git-clone[1]. Um repositório possui uma árvore principal de "
-"trabalho (caso não seja um repositório simples) e zero ou mais árvores de "
-"trabalho vinculadas. Quando você terminar uma árvore de trabalho vinculada, "
-"remova-a com o comando `git worktree remove`."
+msgstr "Um repositório git é compatível com várias árvores de trabalho, permitindo que você verifique mais de um ramo por vez. Com o `git worktree add`, uma nova árvore de trabalho é associada ao repositório. Esta nova árvore de trabalho é chamada de \"árvore de trabalho vinculada\" em oposição à \"árvore de trabalho principal\" preparada através do comando linkgit:git-init[1] ou linkgit:git-clone[1]. Um repositório possui uma árvore principal de trabalho (caso não seja um repositório simples) e zero ou mais árvores de trabalho vinculadas. Quando você terminar uma árvore de trabalho vinculada, remova-a com o comando `git worktree remove`."
#. type: Plain text
#: en/git-worktree.txt:46
@@ -59384,22 +59028,13 @@ msgstr "add <caminho> [<commit-ish>]"
#: en/git-worktree.txt:67
#, priority:240
msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may be a bare \"`-`\", which is synonymous with `@{-1}`."
-msgstr ""
-"Crie um `<caminho>` e faça a averiguação `<commit-ish>` nele. O novo "
-"diretório de trabalho está vinculado ao repositório atual, compartilhando "
-"tudo exceto arquivos específicos do diretório de trabalho, como HEAD, "
-"índice, etc. Por conveniência o `<commit-ish>` pode ser um simples \"`-`\"; "
-"que é um sinônimo de `@{-1}`."
+msgstr "Crie um `<caminho>` e faça a averiguação `<commit-ish>` nele. O novo diretório de trabalho está vinculado ao repositório atual, compartilhando tudo exceto arquivos específicos do diretório de trabalho, como HEAD, índice, etc. Por conveniência o `<commit-ish>` pode ser um simples \"`-`\"; que é um sinônimo de `@{-1}`."
#. type: Plain text
#: en/git-worktree.txt:72
#, priority:240
msgid "If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to:"
-msgstr ""
-"Caso o `<commit-ish>` seja um nome do ramo (chame-o de `<ramo>`) e não for "
-"encontrado, nem `-b`, nem `-B`, nem `--detach`, serão utilizados, porém "
-"existe um monitoramento do ramo em exatamente um ramo remoto (chame-o de "
-"`<remoto>`) com um nome coincidente, trate-o como equivalente a:"
+msgstr "Caso o `<commit-ish>` seja um nome do ramo (chame-o de `<ramo>`) e não for encontrado, nem `-b`, nem `-B`, nem `--detach`, serão utilizados, porém existe um monitoramento do ramo em exatamente um ramo remoto (chame-o de `<remoto>`) com um nome coincidente, trate-o como equivalente a:"
#. type: delimited block -
#: en/git-worktree.txt:75
@@ -59411,40 +59046,19 @@ msgstr "$ git worktree add --track -b <ramo> <caminho> <remoto>/<ramo>\n"
#: en/git-worktree.txt:85
#, priority:240
msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the `origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
-msgstr ""
-"Caso o ramo exista em diversos ramos remotos e um deles seja nomeado pela "
-"variável de configuração `checkout.defaultRemote`, para propósitos de "
-"desambiguação, mesmo que `<ramo>` não seja o único em todos os outros ramos "
-"remotos. Defina por exemplo, `checkout.defaultRemote=origin` para que sempre "
-"verifique as ramificações remotas de lá caso `<ramo>` seja ambíguo e ainda "
-"assim `origin` exista. Consulte também `checkout.defaultRemote` em linkgit"
-":git-config[1]."
+msgstr "Caso o ramo exista em diversos ramos remotos e um deles seja nomeado pela variável de configuração `checkout.defaultRemote`, para propósitos de desambiguação, mesmo que `<ramo>` não seja o único em todos os outros ramos remotos. Defina por exemplo, `checkout.defaultRemote=origin` para que sempre verifique as ramificações remotas de lá caso `<ramo>` seja ambíguo e ainda assim `origin` exista. Consulte também `checkout.defaultRemote` em linkgit:git-config[1]."
#. type: Plain text
#: en/git-worktree.txt:94
#, priority:240
msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new working tree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new working tree, if it's not checked out anywhere else, otherwise the command will refuse to create the working tree (unless `--force` is used)."
-msgstr ""
-"Caso o `<commit-ish>` seja omitido e nem a opção `-b`, `-B` ou `--detach` "
-"sejam utilizados, então, por conveniência, a nova árvore de trabalho será "
-"associada com um ramo (chame-o de `<ramo>`) nomeado após `$(basename "
-"<caminho>)`. Caso o `<ramo>` não exista, um novo ramo com base no `HEAD` "
-"será criado automaticamente como se a opção `-b <ramo>` fosse informado. "
-"Caso o `<ramo>` exista, ele será averiguado na nova árvore de trabalho, se "
-"não tiver sido averiguado em nenhum outro lugar, caso contrário, o comando "
-"se recusará a criar a árvore de trabalho (a menos que `--force` seja "
-"utilizado)."
+msgstr "Caso o `<commit-ish>` seja omitido e nem a opção `-b`, `-B` ou `--detach` sejam utilizados, então, por conveniência, a nova árvore de trabalho será associada com um ramo (chame-o de `<ramo>`) nomeado após `$(basename <caminho>)`. Caso o `<ramo>` não exista, um novo ramo com base no `HEAD` será criado automaticamente como se a opção `-b <ramo>` fosse informado. Caso o `<ramo>` exista, ele será averiguado na nova árvore de trabalho, se não tiver sido averiguado em nenhum outro lugar, caso contrário, o comando se recusará a criar a árvore de trabalho (a menos que `--force` seja utilizado)."
#. type: Plain text
#: en/git-worktree.txt:101
#, priority:240
msgid "List details of each working tree. The main working tree is listed first, followed by each of the linked working trees. The output details include whether the working tree is bare, the revision currently checked out, and the branch currently checked out (or \"detached HEAD\" if none)."
-msgstr ""
-"Liste os detalhes de cada árvore de trabalho. A árvore de trabalho "
-"principal é listada primeiro, seguida por cada uma das árvores de trabalho "
-"vinculadas. Os detalhes gerados incluem se a árvore de trabalho está vazia "
-"e se a revisão e o ramo foi averiguado no momento (ou tem o \"HEAD "
-"desanexado\", caso não haja)."
+msgstr "Liste os detalhes de cada árvore de trabalho. A árvore de trabalho principal é listada primeiro, seguida por cada uma das árvores de trabalho vinculadas. Os detalhes gerados incluem se a árvore de trabalho está vazia e se a revisão e o ramo foi averiguado no momento (ou tem o \"HEAD desanexado\", caso não haja)."
#. type: Labeled list
#: en/git-worktree.txt:102
@@ -59468,12 +59082,7 @@ msgstr "move"
#: en/git-worktree.txt:117
#, priority:240
msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked working trees if you move the main working tree manually.)"
-msgstr ""
-"Mova uma árvore de trabalho para um novo local. Observe que a árvore "
-"principal de trabalho ou as árvores de trabalho vinculadas que contenham "
-"submódulos, não poderão ser movidas com este comando. (Contudo o comando `"
-"git worktree repair` pode restabelecer a conexão com as árvores de trabalho "
-"vinculadas a ela caso você mova manualmente a árvore de trabalho principal.)"
+msgstr "Mova uma árvore de trabalho para um novo local. Observe que a árvore principal de trabalho ou as árvores de trabalho vinculadas que contenham submódulos, não poderão ser movidas com este comando. (Contudo o comando `git worktree repair` pode restabelecer a conexão com as árvores de trabalho vinculadas a ela caso você mova manualmente a árvore de trabalho principal.)"
#. type: Plain text
#: en/git-worktree.txt:121
@@ -59497,9 +59106,7 @@ msgstr "repair [<caminho>...]"
#: en/git-worktree.txt:133
#, priority:240
msgid "Repair working tree administrative files, if possible, if they have become corrupted or outdated due to external factors."
-msgstr ""
-"Faz o reparo dos arquivos administrativos da árvore de trabalho caso tenham "
-"se corrompido ou tenham se desatualizado devido a fatores externos."
+msgstr "Faz o reparo dos arquivos administrativos da árvore de trabalho caso tenham se corrompido ou tenham se desatualizado devido a fatores externos."
#. type: Plain text
#: en/git-worktree.txt:138
@@ -59535,13 +59142,7 @@ msgstr "É predefinido que `add` se recuse a criar uma nova árvore de trabalho
#: en/git-worktree.txt:166
#, priority:240
msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
-msgstr ""
-"o `move` se recusa a mover uma árvore de trabalho bloqueada a menos que a "
-"opção `--force` seja utilizada duas vezes. Caso o destino já esteja "
-"atribuído a alguma outra árvore de trabalho, porém esteja ausente (caso o "
-"`<novo-caminho>` tenha sido excluído manualmente por exemplo), então a opção "
-"`--force` permite que a ação de mover prossiga; utilize a opção --force duas "
-"vezes caso o destino esteja bloqueado."
+msgstr "o `move` se recusa a mover uma árvore de trabalho bloqueada a menos que a opção `--force` seja utilizada duas vezes. Caso o destino já esteja atribuído a alguma outra árvore de trabalho, porém esteja ausente (caso o `<novo-caminho>` tenha sido excluído manualmente por exemplo), então a opção `--force` permite que a ação de mover prossiga; utilize a opção --force duas vezes caso o destino esteja bloqueado."
#. type: Plain text
#: en/git-worktree.txt:169
@@ -59565,21 +59166,13 @@ msgstr "-B <novo-ramo>"
#: en/git-worktree.txt:178
#, priority:240
msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
-msgstr ""
-"Com `add`, crie um novo ramo chamado `<novo-ramo>` (novo-ramo) começando em "
-"`<commit-ish>` e faça uma averiguação do `<novo-ramo>` na nova árvore de "
-"trabalho. Caso o `<commit-ish>` seja omitido, a predefinição retorna para "
-"`HEAD`. É predefinido que `b` se recuse a criar um novo ramo, caso ele já "
-"exista. O `B` substitui esta salvaguarda, redefinindo o `<novo-ramo>` para "
-"`<commit-ish>`."
+msgstr "Com `add`, crie um novo ramo chamado `<novo-ramo>` (novo-ramo) começando em `<commit-ish>` e faça uma averiguação do `<novo-ramo>` na nova árvore de trabalho. Caso o `<commit-ish>` seja omitido, a predefinição retorna para `HEAD`. É predefinido que `b` se recuse a criar um novo ramo, caso ele já exista. O `B` substitui esta salvaguarda, redefinindo o `<novo-ramo>` para `<commit-ish>`."
#. type: Plain text
#: en/git-worktree.txt:183
#, priority:240
msgid "With `add`, detach `HEAD` in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
-msgstr ""
-"Com `add`, desanexe o `HEAD` na nova árvore de trabalho. Consulte \"HEAD "
-"DESANEXADO\" em linkgit:git-checkout[1]."
+msgstr "Com `add`, desanexe o `HEAD` na nova árvore de trabalho. Consulte \"HEAD DESANEXADO\" em linkgit:git-checkout[1]."
#. type: Labeled list
#: en/git-worktree.txt:184
@@ -59603,12 +59196,7 @@ msgstr "--[no-]guess-remote"
#: en/git-worktree.txt:196
#, priority:240
msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
-msgstr ""
-"Com `worktree add <caminho>`, sem `<commit-ish>`, em vez de criar uma nova "
-"ramificação a partir do `HEAD`, caso exista uma ramificação de rastreamento "
-"em exatamente um ponto remoto que coincida com o `basename` do `<caminho>`, "
-"baseie a nova ramificação na ramificação remota rastreada e marque a "
-"ramificação rastreada remoto como um \"upstream\" da nova ramificação."
+msgstr "Com `worktree add <caminho>`, sem `<commit-ish>`, em vez de criar uma nova ramificação a partir do `HEAD`, caso exista uma ramificação de rastreamento em exatamente um ponto remoto que coincida com o `basename` do `<caminho>`, baseie a nova ramificação na ramificação remota rastreada e marque a ramificação rastreada remoto como um \"upstream\" da nova ramificação."
#. type: Plain text
#: en/git-worktree.txt:199
@@ -59626,11 +59214,7 @@ msgstr "--[no-]track"
#: en/git-worktree.txt:205
#, priority:240
msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details."
-msgstr ""
-"Ao criar um novo ramo, caso `<commit-ish>` seja um ramo, marque-a como "
-"\"upstream\" a partir do novo ramo. Essa é a predefinição caso `<commit-"
-"ish>` seja um ramo monitorado remotamente. Para mais detalhes, consulte "
-"`--track` em linkgit:git-branch[1]."
+msgstr "Ao criar um novo ramo, caso `<commit-ish>` seja um ramo, marque-a como \"upstream\" a partir do novo ramo. Essa é a predefinição caso `<commit-ish>` seja um ramo monitorado remotamente. Para mais detalhes, consulte `--track` em linkgit:git-branch[1]."
#. type: Labeled list
#: en/git-worktree.txt:206
@@ -59642,10 +59226,7 @@ msgstr "--lock"
#: en/git-worktree.txt:210
#, priority:240
msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition."
-msgstr ""
-"Mantenha a árvore de trabalho bloqueada após a criação. Isso é equivalente "
-"ao comando `git worktree lock` após `git worktree add`, porém sem a condição "
-"de corrida."
+msgstr "Mantenha a árvore de trabalho bloqueada após a criação. Isso é equivalente ao comando `git worktree lock` após `git worktree add`, porém sem a condição de corrida."
#. type: Plain text
#: en/git-worktree.txt:215
@@ -59675,9 +59256,7 @@ msgstr "Com `prune`, relate todas as remoções."
#: en/git-worktree.txt:231
#, priority:240
msgid "With `prune`, only expire unused working trees older than `<time>`."
-msgstr ""
-"Com `prune`, expire apenas as árvores de trabalho não utilizadas mais velhas "
-"que `<tempo>`."
+msgstr "Com `prune`, expire apenas as árvores de trabalho não utilizadas mais velhas que `<tempo>`."
#. type: Labeled list
#: en/git-worktree.txt:232
@@ -59707,12 +59286,7 @@ msgstr "As árvores de trabalho podem ser identificadas através do caminho, sej
#: en/git-worktree.txt:243
#, priority:240
msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify a working tree. For example if you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former working tree."
-msgstr ""
-"Caso os componentes do último caminho da árvore de trabalho sejam únicos "
-"entre as árvores, ele poderá ser utilizado para identificar as árvores de "
-"trabalho. Como por exemplo, caso tenha apenas duas árvores de trabalho, em `/"
-"abc/def/ghi` e `/abc/def/ggg`, `ghi` ou `def/ghi` serão suficientes para "
-"apontar para a antiga árvore de trabalho."
+msgstr "Caso os componentes do último caminho da árvore de trabalho sejam únicos entre as árvores, ele poderá ser utilizado para identificar as árvores de trabalho. Como por exemplo, caso tenha apenas duas árvores de trabalho, em `/abc/def/ghi` e `/abc/def/ggg`, `ghi` ou `def/ghi` serão suficientes para apontar para a antiga árvore de trabalho."
#. type: Title -
#: en/git-worktree.txt:245
@@ -59724,72 +59298,43 @@ msgstr "REFS"
#: en/git-worktree.txt:250
#, priority:240
msgid "In multiple working trees, some refs may be shared between all working trees and some refs are local. One example is `HEAD` which is different for each working tree. This section is about the sharing rules and how to access refs of one working tree from another."
-msgstr ""
-"Em várias árvores de trabalho diferentes, algumas refs podem ser "
-"compartilhadas entre todas as árvores de trabalho e já outras refs são "
-"locais. Um exemplo é o `HEAD` que é único para cada a árvores de trabalho. "
-"Esta seção é sobre as regras de compartilhamento e como acessar tais refs de "
-"uma árvore de trabalho para outra."
+msgstr "Em várias árvores de trabalho diferentes, algumas refs podem ser compartilhadas entre todas as árvores de trabalho e já outras refs são locais. Um exemplo é o `HEAD` que é único para cada a árvores de trabalho. Esta seção é sobre as regras de compartilhamento e como acessar tais refs de uma árvore de trabalho para outra."
#. type: Plain text
#: en/git-worktree.txt:256
#, priority:240
msgid "In general, all pseudo refs are per working tree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared."
-msgstr ""
-"Geralmente, cada árvore de trabalho possuí uma ref própria e todas as refs "
-"que iniciem com `refs/` podem ser compartilhados. Os pseudo-refs são aqueles "
-"como `HEAD` que estão diretamente sob `$GIT_DIR` ao invés de estarem dentro "
-"do `GIT_DIR/refs`. Contudo há exceções: as refs não serão compartilhadas "
-"quando estiverem dentro do `refs/bisect` e do `refs/worktree`."
+msgstr "Geralmente, cada árvore de trabalho possuí uma ref própria e todas as refs que iniciem com `refs/` podem ser compartilhados. Os pseudo-refs são aqueles como `HEAD` que estão diretamente sob `$GIT_DIR` ao invés de estarem dentro do `GIT_DIR/refs`. Contudo há exceções: as refs não serão compartilhadas quando estiverem dentro do `refs/bisect` e do `refs/worktree`."
#. type: Plain text
#: en/git-worktree.txt:261
#, priority:240
msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-working tree refs of the main working tree, while the latter to all linked working trees."
-msgstr ""
-"As refs individuais de cada árvore de trabalho ainda podem ser acessadas de "
-"uma outra árvore de trabalho através de dois caminhos especiais, `main-"
-"worktree` e `worktrees`. A primeira oferece acesso `ref` individual a cada "
-"árvore de trabalho principal, enquanto a última a todas as árvores de "
-"trabalho que forem vinculadas à ela."
+msgstr "As refs individuais de cada árvore de trabalho ainda podem ser acessadas de uma outra árvore de trabalho através de dois caminhos especiais, `main-worktree` e `worktrees`. A primeira oferece acesso `ref` individual a cada árvore de trabalho principal, enquanto a última a todas as árvores de trabalho que forem vinculadas à ela."
#. type: Plain text
#: en/git-worktree.txt:268
#, priority:240
msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main working tree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
-msgstr ""
-"Como por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` "
-"resolve para o mesmo valor que `HEAD` nas principais árvores, assim como `"
-"refs/bisect/good` respectivamente. Da mesma forma, `worktrees/foo/HEAD` e `"
-"worktrees/bar/refs/bisect/bad` são as mesmas que `$GIT_COMMON_DIR/worktrees/"
-"foo/HEAD` e `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
+msgstr "Como por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` resolve para o mesmo valor que `HEAD` nas principais árvores, assim como `refs/bisect/good` respectivamente. Da mesma forma, `worktrees/foo/HEAD` e `worktrees/bar/refs/bisect/bad` são as mesmas que `$GIT_COMMON_DIR/worktrees/foo/HEAD` e `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
#. type: Plain text
#: en/git-worktree.txt:272
#, priority:240
msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
-msgstr ""
-"Para acessar as `refs` é melhor não olhar diretamente para dentro do "
-"`$GIT_DIR`. Em vez disso, use comandos como o linkgit:git-rev-parse[1] ou "
-"linkgit:git-update-ref[1] que manipularão corretamente as refs."
+msgstr "Para acessar as `refs` é melhor não olhar diretamente para dentro do `$GIT_DIR`. Em vez disso, use comandos como o linkgit:git-rev-parse[1] ou linkgit:git-update-ref[1] que manipularão corretamente as refs."
#. type: Plain text
#: en/git-worktree.txt:279
#, priority:240
msgid "By default, the repository `config` file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
-msgstr ""
-"É predefinido que o arquivo `config` do repositório seja compartilhado entre "
-"todas as árvores de trabalho. Caso as variáveis da configuração `core.bare` "
-"ou `core.worktree` estejam presentes no arquivo de configuração elas serão "
-"aplicadas apenas às principais árvores de trabalho."
+msgstr "É predefinido que o arquivo `config` do repositório seja compartilhado entre todas as árvores de trabalho. Caso as variáveis da configuração `core.bare` ou `core.worktree` estejam presentes no arquivo de configuração elas serão aplicadas apenas às principais árvores de trabalho."
#. type: Plain text
#: en/git-worktree.txt:282
#, priority:240
msgid "In order to have configuration specific to working trees, you can turn on the `worktreeConfig` extension, e.g.:"
-msgstr ""
-"Você pode ativar a extensão `worktreeConfig` para ter uma configuração "
-"específica para as árvores de trabalho, por exemplo:"
+msgstr "Você pode ativar a extensão `worktreeConfig` para ter uma configuração específica para as árvores de trabalho, por exemplo:"
#. type: delimited block -
#: en/git-worktree.txt:285
@@ -59807,12 +59352,7 @@ msgstr "Neste modo, a configuração específica permanece no caminho apontado p
#: en/git-worktree.txt:297
#, priority:240
msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
-msgstr ""
-"Observe que neste arquivo, a exceção para `core.bare` e `core.worktree` "
-"desapareceu. Caso existam no `$GIT_DIR/config`, você deve movê-los para o "
-"`config.worktree` da árvore principal de trabalho. Você também pode "
-"aproveitar esta oportunidade para revisar e mover as outras configurações "
-"que não deseja compartilhar com todas as árvores de trabalho:"
+msgstr "Observe que neste arquivo, a exceção para `core.bare` e `core.worktree` desapareceu. Caso existam no `$GIT_DIR/config`, você deve movê-los para o `config.worktree` da árvore principal de trabalho. Você também pode aproveitar esta oportunidade para revisar e mover as outras configurações que não deseja compartilhar com todas as árvores de trabalho:"
#. type: Plain text
#: en/git-worktree.txt:299
@@ -59836,89 +59376,43 @@ msgstr "DETALHES"
#: en/git-worktree.txt:313
#, priority:240
msgid "Each linked working tree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
-msgstr ""
-"Cada árvore de trabalho vinculada possui um subdiretório privado no "
-"diretório `$GIT_DIR/worktrees` do repositório. O nome do subdiretório "
-"particular é geralmente o nome base do caminho do vínculo da árvore de "
-"trabalho, possivelmente anexada a um número para torná-lo único. Como por "
-"exemplo, quando `$GIT_DIR=/path/main/.git` o comando` `git worktree add /"
-"path/other/test-next next` cria a árvore de trabalho vinculada no `/path/"
-"other/test-next` e também cria um diretório `$GIT_DIR/worktrees/test-next` ("
-"ou `$GIT_DIR/worktrees/test-next1` caso `test-next` já esteja em uso)."
+msgstr "Cada árvore de trabalho vinculada possui um subdiretório privado no diretório `$GIT_DIR/worktrees` do repositório. O nome do subdiretório particular é geralmente o nome base do caminho do vínculo da árvore de trabalho, possivelmente anexada a um número para torná-lo único. Como por exemplo, quando `$GIT_DIR=/path/main/.git` o comando` `git worktree add /path/other/test-next next` cria a árvore de trabalho vinculada no `/path/other/test-next` e também cria um diretório `$GIT_DIR/worktrees/test-next` (ou `$GIT_DIR/worktrees/test-next1` caso `test-next` já esteja em uso)."
#. type: Plain text
#: en/git-worktree.txt:319
#, priority:240
msgid "Within a linked working tree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
-msgstr ""
-"Dentro de uma árvore de trabalho vinculada, `$GIT_DIR` é configurado para "
-"apontar para este diretório privado (`/path/main/.git/worktrees/test-next` "
-"no exemplo) e `$GIT_COMMON_DIR` é configurado para apontar de volta para a "
-"árvore de trabalho principal `$GIT_DIR` (`/path/main/.git` por exemplo). "
-"Estas configurações são feitas em um arquivo `.git` localizado no diretório "
-"vinculado mais alto da árvore de trabalho."
+msgstr "Dentro de uma árvore de trabalho vinculada, `$GIT_DIR` é configurado para apontar para este diretório privado (`/path/main/.git/worktrees/test-next` no exemplo) e `$GIT_COMMON_DIR` é configurado para apontar de volta para a árvore de trabalho principal `$GIT_DIR` (`/path/main/.git` por exemplo). Estas configurações são feitas em um arquivo `.git` localizado no diretório vinculado mais alto da árvore de trabalho."
#. type: Plain text
#: en/git-worktree.txt:329
#, priority:240
msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except `refs/bisect` and `refs/worktree`."
-msgstr ""
-"A resolução do caminho através do comando `git rev-parse --git-path` utiliza "
-"`$GIT_DIR` ou `$GIT_COMMON_DIR`, dependendo do caminho. Na árvore de "
-"trabalho vinculada, o comando `git rev-parse --git-path HEAD` retorna `/path/"
-"main/.git/worktrees/test-next/HEAD` (não `/path/other/test-next/.git/HEAD` "
-"ou `/path/main/.git/HEAD`) enquanto o comando `git rev-parse --git-path refs/"
-"heads/master` usa `$GIT_COMMON_DIR` e retorna `/path/main/.git/refs/heads/"
-"master`, já que as refs são compartilhados em todas as árvores de trabalho, "
-"exceto `refs/bisect` e `refs/worktree`."
+msgstr "A resolução do caminho através do comando `git rev-parse --git-path` utiliza `$GIT_DIR` ou `$GIT_COMMON_DIR`, dependendo do caminho. Na árvore de trabalho vinculada, o comando `git rev-parse --git-path HEAD` retorna `/path/main/.git/worktrees/test-next/HEAD` (não `/path/other/test-next/.git/HEAD` ou `/path/main/.git/HEAD`) enquanto o comando `git rev-parse --git-path refs/heads/master` usa `$GIT_COMMON_DIR` e retorna `/path/main/.git/refs/heads/master`, já que as refs são compartilhados em todas as árvores de trabalho, exceto `refs/bisect` e `refs/worktree`."
#. type: Plain text
#: en/git-worktree.txt:334
#, priority:240
msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path."
-msgstr ""
-"Para mais informações consulte linkgit:gitrepository-layout[5]. A regra "
-"geral é não fazer qualquer suposição sobre se um caminho pertence ao "
-"`$GIT_DIR` ou ao `$GIT_COMMON_DIR` quando você precisar acessar diretamente "
-"algo dentro do `$GIT_DIR`. Para obter o caminho final utilize o comando `git "
-"rev-parse --git-path`."
+msgstr "Para mais informações consulte linkgit:gitrepository-layout[5]. A regra geral é não fazer qualquer suposição sobre se um caminho pertence ao `$GIT_DIR` ou ao `$GIT_COMMON_DIR` quando você precisar acessar diretamente algo dentro do `$GIT_DIR`. Para obter o caminho final utilize o comando `git rev-parse --git-path`."
#. type: Plain text
#: en/git-worktree.txt:342
#, priority:240
msgid "If you manually move a linked working tree, you need to update the `gitdir` file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically."
-msgstr ""
-"Caso queira mover manualmente o vínculo de uma árvore de trabalho, será "
-"preciso atualizar o arquivo 'gitdir' no diretório da entrada. Como por "
-"exemplo, caso o vínculo de uma árvore de trabalho seja movida para `/newpath/"
-"test-next` e o seu arquivo `.git` aponte para `/path/main/.git/worktrees/"
-"test-next`, então atualize `/path/main/.git/worktrees/test-next/gitdir` para "
-"a referência `/newpath/test-next`. Melhor ainda, execute o comando `git "
-"worktree repair` para restabelecer a conexão automaticamente."
+msgstr "Caso queira mover manualmente o vínculo de uma árvore de trabalho, será preciso atualizar o arquivo 'gitdir' no diretório da entrada. Como por exemplo, caso o vínculo de uma árvore de trabalho seja movida para `/newpath/test-next` e o seu arquivo `.git` aponte para `/path/main/.git/worktrees/test-next`, então atualize `/path/main/.git/worktrees/test-next/gitdir` para a referência `/newpath/test-next`. Melhor ainda, execute o comando `git worktree repair` para restabelecer a conexão automaticamente."
#. type: Plain text
#: en/git-worktree.txt:353
#, priority:240
msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
-msgstr ""
-"Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode "
-"ser útil em algumas situações, como quando a árvore de trabalho da entrada é "
-"armazenada em um dispositivo portátil), utilize o comando `git worktree lock`"
-" que adiciona um arquivo chamado 'locked' ao diretório da entrada. O arquivo "
-"contém o motivo no formato texto puro, sem formatação. Por exemplo, caso o "
-"arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` então o "
-"arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenirá que a "
-"entrada `test-next` seja excluída. Para mais detalhes consulte linkgit"
-":gitrepository-layout[5]."
+msgstr "Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode ser útil em algumas situações, como quando a árvore de trabalho da entrada é armazenada em um dispositivo portátil), utilize o comando `git worktree lock` que adiciona um arquivo chamado 'locked' ao diretório da entrada. O arquivo contém o motivo no formato texto puro, sem formatação. Por exemplo, caso o arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` então o arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenirá que a entrada `test-next` seja excluída. Para mais detalhes consulte linkgit:gitrepository-layout[5]."
#. type: Plain text
#: en/git-worktree.txt:356
#, priority:240
msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
-msgstr ""
-"Quando a opção de configuração `extensions.worktreeConfig` está ativo, o "
-"arquivo de configuração `.git/worktrees/<id>/config.worktree` é lido após o `"
-".git/config`."
+msgstr "Quando a opção de configuração `extensions.worktreeConfig` está ativo, o arquivo de configuração `.git/worktrees/<id>/config.worktree` é lido após o `.git/config`."
#. type: Title -
#: en/git-worktree.txt:358
@@ -59930,9 +59424,7 @@ msgstr "FORMATO DA LISTA DE SAÍDA"
#: en/git-worktree.txt:361
#, priority:240
msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:"
-msgstr ""
-"O comando `worktree list` gera dois formatos na saída. O formato já "
-"predefinido exibe os detalhes em uma única linha com colunas. Por exemplo:"
+msgstr "O comando `worktree list` gera dois formatos na saída. O formato já predefinido exibe os detalhes em uma única linha com colunas. Por exemplo:"
#. type: delimited block -
#: en/git-worktree.txt:367
@@ -59958,13 +59450,7 @@ msgstr "Formato Porcelana"
#: en/git-worktree.txt:376
#, priority:240
msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. The first attribute of a working tree is always `worktree`, an empty line indicates the end of the record. For example:"
-msgstr ""
-"O formato porcelana possui uma linha por atributo. Os atributos são listados "
-"através de um valor e um rótulo separadas por um espaço. Os atributos "
-"booleanos (como `bare` e `detached`) são listados apenas com um rótulo e "
-"estão presente apenas e somente caso o valor seja verdadeiro. O primeiro "
-"atributo da árvore de trabalho será sempre `worktree`, uma linha vazia "
-"indica o fim do registro. Por exemplo:"
+msgstr "O formato porcelana possui uma linha por atributo. Os atributos são listados através de um valor e um rótulo separadas por um espaço. Os atributos booleanos (como `bare` e `detached`) são listados apenas com um rótulo e estão presente apenas e somente caso o valor seja verdadeiro. O primeiro atributo da árvore de trabalho será sempre `worktree`, uma linha vazia indica o fim do registro. Por exemplo:"
#. type: delimited block -
#: en/git-worktree.txt:381
@@ -61272,10 +60758,7 @@ msgstr "[[def_tree_object]]tree object (objeto árvore)"
#: en/glossary-content.txt:639
#, priority:100
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
-msgstr ""
-"Um <<def_object,objeto>> contendo uma lista de nomes e modos em conjunto com "
-"`refs` associados as sua bolhas e ou objetos da árvore. Um <<def_tree,tree>> "
-"é equivalente a um <<def_directory,diretório>>."
+msgstr "Um <<def_object,objeto>> contendo uma lista de nomes e modos em conjunto com `refs` associados as sua bolhas e ou objetos da árvore. Um <<def_tree,tree>> é equivalente a um <<def_directory,diretório>>."
#. type: Labeled list
#: en/glossary-content.txt:640
@@ -62577,16 +62060,11 @@ msgstr "redefine a cor"
msgid "'%C(...)'"
msgstr "'%C(...)'"
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr "definições das cores, conforme descrito em Valores no"
-
#. type: Plain text
#: en/pretty-formats.txt:146
-#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+#, fuzzy, ignore-ellipsis, priority:260
+#| msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr "\"ARQUIVO DE CONFIGURAÇÃO\" seção do linkgit:git-config[1]. É predefinido que as cores sejam exibidas apenas quando ativadas para na saída do registro log (em `color.diff`,` color.ui` ou `color`, e respeitando as configurações `auto` da primeira se estivermos indo para um terminal). `%C(auto,...)` é aceito como um sinônimo histórico do padrão (exemplo., `%C(auto,red)`). Especificar `%C(always,...)` exibirá as cores mesmo quando a cor não estiver ativada (embora considere apenas usar `--color=always` para sempre ativar a cor na saída incluindo este formato e qualquer outro que o git possa colorir). `auto` sozinho (ou seja,`%C(auto)`) ativará a coloração automática nos próximos espaços reservados até que a cor seja trocada novamente."
#. type: Labeled list
@@ -62607,17 +62085,12 @@ msgstr "marca esquerda (`<`), direita (`>`) ou limite (`-`)"
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr "'%w([<w>[,<i1>[,<i2>]]])'"
-#. type: Plain text
-#: en/pretty-formats.txt:148
-#, priority:260
-msgid "switch line wrapping, like the -w option of"
-msgstr "alterna a quebra de linha, como a opção `-w` de"
-
#. type: Plain text
#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
+#, fuzzy, priority:260
+#| msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgstr "alterna a quebra de linha, como a opção `-w` de"
#. type: Labeled list
#: en/pretty-formats.txt:149
@@ -62625,16 +62098,11 @@ msgstr "linkgit:git-shortlog[1]."
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr "'%<(<N>[,trunc|ltrunc|mtrunc])'"
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr "faça com que o próximo espaço reservado leve em"
-
#. type: Plain text
#: en/pretty-formats.txt:157
-#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+#, fuzzy, priority:260
+#| msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr "menos N colunas, preenchendo espaços à direita, se necessário. Opcionalmente, truncar no início (ltrunc), no meio (mtrunc) ou no final (trunc) caso a saída seja maior que N colunas. Observe que o truncamento funciona corretamente com N >= 2."
#. type: Labeled list
@@ -62643,17 +62111,12 @@ msgstr "menos N colunas, preenchendo espaços à direita, se necessário. Opcio
msgid "'%<|(<N>)'"
msgstr "'%<|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr "faça com que o próximo espaço reservado leve pelo menos até a enésima"
-
#. type: Plain text
#: en/pretty-formats.txt:159
-#, priority:260
-msgid "columns, padding spaces on the right if necessary"
-msgstr "colunas, preenchimento de espaços à direita se necessário"
+#, fuzzy, priority:260
+#| msgid "make the next placeholder take at least until Nth"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
+msgstr "faça com que o próximo espaço reservado leve pelo menos até a enésima"
#. type: Labeled list
#: en/pretty-formats.txt:159
@@ -62661,17 +62124,12 @@ msgstr "colunas, preenchimento de espaços à direita se necessário"
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr "'%>(<N>)', '%>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr "semelhante a '%<(<N>)', '%<|(<N>)' respectivamente,"
-
#. type: Plain text
#: en/pretty-formats.txt:161
-#, priority:260
-msgid "but padding spaces on the left"
-msgstr "mas com espaços de preenchimento à esquerda"
+#, fuzzy, priority:260
+#| msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
+msgstr "semelhante a '%<(<N>)', '%<|(<N>)' respectivamente,"
#. type: Labeled list
#: en/pretty-formats.txt:161
@@ -62679,16 +62137,11 @@ msgstr "mas com espaços de preenchimento à esquerda"
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr "'%>>(<N>)', '%>>|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:166
-#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+#, fuzzy, priority:260
+#| msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr "respectivamente, exceto caso o próximo espaço reservado ocupe mais espaços do que o informado e haja espaços à esquerda, utilize estes espaços"
#. type: Labeled list
@@ -62697,16 +62150,11 @@ msgstr "respectivamente, exceto caso o próximo espaço reservado ocupe mais esp
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr "'%><(<N>)', '%><|(<N>)'"
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr "semelhante a '%<(<N>)', '%<|(<N>)'"
-
#. type: Plain text
#: en/pretty-formats.txt:169
-#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+#, fuzzy, priority:260
+#| msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr "respectivamente, mas preenchendo os dois lados (ou seja, o texto é centralizado)"
#. type: Plain text
@@ -62806,17 +62254,12 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:180
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "nome do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "ou linkgit:git-blame[1])"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -62836,9 +62279,10 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
@@ -62860,16 +62304,11 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr "parte local do autor (consulte '%al') respeitando .mailmap, consulte"
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:186
@@ -62974,10 +62413,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr "nome de quem fez o commit (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nome do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -62998,10 +62438,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -63022,9 +62463,10 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "parte local de quem fez o commit (consulte '%cl') respeitando o .mailmap, consulte"
#. type: Labeled list
@@ -63135,17 +62577,12 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr "nomes de referência \"ref\" sem quebra automática \" (\", \")\"."
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr "nomes \"ref\" dado na linha de comando pela qual o commit foi alcançado"
-
#. type: Plain text
#: en/pretty-formats.txt:213
-#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
-msgstr "(como `git log --source`), só funciona com `git log`"
+#, fuzzy, priority:260
+#| msgid "ref name given on the command line by which the commit was reached"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
+msgstr "nomes \"ref\" dado na linha de comando pela qual o commit foi alcançado"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -63231,16 +62668,11 @@ msgstr "verificação bruta da mensagem vinda do GPG para um commit assinado"
msgid "'%G?'"
msgstr "'%G?'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr "exibe \"G\" para obter uma boa assinatura (válida),"
-
#. type: Plain text
#: en/pretty-formats.txt:230
-#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+#, fuzzy, priority:260
+#| msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr "\"B\" para uma assinatura ruim, \"U\" para uma boa assinatura com validade desconhecida, \"X\" para uma boa assinatura que expirou, \"Y\" para uma boa assinatura feita por uma chave expirada, \"R\" para uma boa assinatura feita por uma chave revogada, \"E\" caso a assinatura não possa ser verificada (por exemplo, uma chave ausente) e \"N\" sem assinatura"
#. type: Labeled list
@@ -63285,17 +62717,12 @@ msgstr "exiba a impressão digital da chave utilizada para assinar um commit já
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr "exiba a impressão digital da chave primária cuja subchave foi utilizada"
-
#. type: Plain text
#: en/pretty-formats.txt:235
-#, priority:260
-msgid "to sign a signed commit"
-msgstr "para assinar um commit assinado"
+#, fuzzy, priority:260
+#| msgid "show the fingerprint of the primary key whose subkey was used"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
+msgstr "exiba a impressão digital da chave primária cuja subchave foi utilizada"
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -63315,16 +62742,11 @@ msgstr "exiba o nível de confiança da chave utilizada para assinar um commit a
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr "seletor do \"reflog\", por exemplo, `refs/stash@{1}` ou `refs/stash@{2"
-
#. type: Plain text
#: en/pretty-formats.txt:241
-#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+#, fuzzy, priority:260
+#| msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr "minutos atrás} `; o formato segue as regras descritas para a opção `-g`. A parte antes ao `@` é o \"refname\", conforme indicado na linha de comando (portanto, `git log -g refs/heads/master` produziria `refs/heads/master@{0}`)."
#. type: Labeled list
@@ -63333,16 +62755,11 @@ msgstr "minutos atrás} `; o formato segue as regras descritas para a opção `-
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr "seletor do reflog encurtado; o mesmo que '%gD', menos o \"refname\""
-
#. type: Plain text
#: en/pretty-formats.txt:244
-#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+#, fuzzy, priority:260
+#| msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr "a parte é reduzida visando a legibilidade humana (assim, `refs/heads/master` se torna apenas `master`)."
#. type: Labeled list
@@ -63364,10 +62781,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr "nome da identidade reflog (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "nome do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -63388,10 +62806,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr "e-mail da identidade reflog (respeitando .mailmap, consulte"
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "e-mail do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -63411,16 +62830,11 @@ msgstr "assunto reflog"
msgid "'%(trailers[:options])'"
msgstr "'%(trailers[:options])'"
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr "exiba os sinais de resposta no corpo da mensagem como"
-
#. type: Plain text
#: en/pretty-formats.txt:256
-#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+#, fuzzy, priority:260
+#| msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr "interpretado por linkgit:git-interpret-trailers[1]. A carreira de caracteres de resposta pode ser seguida por dois pontos e zero ou mais opções separadas por vírgula:"
#. type: Plain text
@@ -63585,11 +62999,7 @@ msgstr "--no-abbrev-commit"
#: en/pretty-options.txt:30
#, priority:260
msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit`, either explicit or implied by other options such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
-msgstr ""
-"Exibe o nome do objeto commit completo com 40 bytes hexadecimais. Isso nega "
-"o a opção `--abbrev-commit`, de forma explícita ou implícita pelas outras "
-"opções como \"--oneline\". Ele também substitui a variável `log."
-"abbrevCommit`."
+msgstr "Exibe o nome do objeto commit completo com 40 bytes hexadecimais. Isso nega o a opção `--abbrev-commit`, de forma explícita ou implícita pelas outras opções como \"--oneline\". Ele também substitui a variável `log.abbrevCommit`."
#. type: Plain text
#: en/pretty-options.txt:34
@@ -63821,12 +63231,7 @@ msgstr "DEFININDO AS REVISÕES"
#: en/revisions.txt:9
#, priority:100
msgid "A revision parameter '<rev>' typically, but not necessarily, names a commit object. It uses what is called an 'extended SHA-1' syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit."
-msgstr ""
-"Um parâmetro de revisão '<rev>' normalmente, mas não necessariamente, dá "
-"nome a um objeto commit. Utiliza o que é chamado de uma sintaxe 'extended "
-"SHA-1'. Aqui estão as várias maneiras de soletrar os nomes dos objetos. Os "
-"listados próximos do final desta lista informam árvores e as bolhas "
-"existentes em um commit."
+msgstr "Um parâmetro de revisão '<rev>' normalmente, mas não necessariamente, dá nome a um objeto commit. Utiliza o que é chamado de uma sintaxe 'extended SHA-1'. Aqui estão as várias maneiras de soletrar os nomes dos objetos. Os listados próximos do final desta lista informam árvores e as bolhas existentes em um commit."
#. type: Plain text
#: en/revisions.txt:13
@@ -64146,14 +63551,7 @@ msgstr "'<rev>:<caminho>', exemplo, 'HEAD:README', 'master:./README'"
#: en/revisions.txt:207
#, priority:100
msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
-msgstr ""
-"Um sufixo ':' seguido de um caminho nomeia a bolha ou a árvore no caminho "
-"especificado no objeto da árvore \"ish\" informado pela parte antes dos "
-"dois pontos. Um caminho começando com './' ou '../' é relativo ao diretório "
-"de trabalho atual. O caminho especificado será convertido para ser relativo "
-"ao diretório raiz da árvore de trabalho. Isso é mais útil para abordar uma "
-"bolha ou árvore de um commit ou uma árvore que tenha a mesma estrutura de "
-"árvore que uma árvore de trabalho."
+msgstr "Um sufixo ':' seguido de um caminho nomeia a bolha ou a árvore no caminho especificado no objeto da árvore \"ish\" informado pela parte antes dos dois pontos. Um caminho começando com './' ou '../' é relativo ao diretório de trabalho atual. O caminho especificado será convertido para ser relativo ao diretório raiz da árvore de trabalho. Isso é mais útil para abordar uma bolha ou árvore de um commit ou uma árvore que tenha a mesma estrutura de árvore que uma árvore de trabalho."
#. type: Labeled list
#: en/revisions.txt:208
@@ -64165,14 +63563,7 @@ msgstr "':[<n>:]<caminho>', exemplo, ':0:README', ':README'"
#: en/revisions.txt:216
#, priority:100
msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
-msgstr ""
-"Os dois pontos opcionalmente seguidos por um número de estágio (0 para 3) e "
-"dois pontos, seguidos por um caminho, informam um objeto bolha no índice no "
-"caminho especificado. Nomeia uma entrada de estágio quando o número estiver "
-"ausente (assim como dois pontos que o seguem). Durante uma mesclagem, o "
-"estágio 1 é o ancestral comum, o estágio 2 é a versão do ramo de destino ("
-"normalmente o ramo atual) e o estágio 3 é a versão do ramo que está sendo "
-"mesclado."
+msgstr "Os dois pontos opcionalmente seguidos por um número de estágio (0 para 3) e dois pontos, seguidos por um caminho, informam um objeto bolha no índice no caminho especificado. Nomeia uma entrada de estágio quando o número estiver ausente (assim como dois pontos que o seguem). Durante uma mesclagem, o estágio 1 é o ancestral comum, o estágio 2 é a versão do ramo de destino (normalmente o ramo atual) e o estágio 3 é a versão do ramo que está sendo mesclado."
#. type: Plain text
#: en/revisions.txt:220
@@ -64248,9 +63639,7 @@ msgstr "Para estes comandos, defina uma única revisão utilizando a notação d
#: en/revisions.txt:259
#, priority:100
msgid "Specifying several revisions means the set of commits reachable from any of the given commits."
-msgstr ""
-"Ao especificar várias revisões significa que o conjunto dos commits "
-"acessíveis a partir de qualquer um dos commits informados."
+msgstr "Ao especificar várias revisões significa que o conjunto dos commits acessíveis a partir de qualquer um dos commits informados."
#. type: Plain text
#: en/revisions.txt:262
@@ -64786,13 +64175,7 @@ msgstr "As opções `--no-min-parents` e `--no-max-parents` redefinem estes limi
#: en/rev-list-options.txt:132
#, priority:260
msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge."
-msgstr ""
-"Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit. "
-"Essa opção pode lhe fornecer uma melhor visão geral durante a visualização "
-"da evolução de um tópico específico no ramo, pois faz a mesclagem em um "
-"tópico no ramo e tende a ser apenas sobre o ajuste das atualizações upstream "
-"de tempos em tempos, esta opção permite ignorar os commits individuais "
-"trazidas para o seu histórico feitas por essa mesclagem."
+msgstr "Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit. Essa opção pode lhe fornecer uma melhor visão geral durante a visualização da evolução de um tópico específico no ramo, pois faz a mesclagem em um tópico no ramo e tende a ser apenas sobre o ajuste das atualizações upstream de tempos em tempos, esta opção permite ignorar os commits individuais trazidas para o seu histórico feitas por essa mesclagem."
#. type: Plain text
#: en/rev-list-options.txt:136
@@ -64900,10 +64283,7 @@ msgstr "--bisect"
#: en/rev-list-options.txt:210
#, priority:260
msgid "Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command line."
-msgstr ""
-"Finja como se uma bisseção ruim \"ref\" `refs/bisect/bad` estivesse listada "
-"e como se fosse seguida por `--not` e a boa bisseção refs `refs/bisect/"
-"good-*` na linha de comando."
+msgstr "Finja como se uma bisseção ruim \"ref\" `refs/bisect/bad` estivesse listada e como se fosse seguida por `--not` e a boa bisseção refs `refs/bisect/good-*` na linha de comando."
#. type: Plain text
#: en/rev-list-options.txt:217
@@ -65697,11 +65077,7 @@ msgstr "Além dos commits exibidos no histórico predefinido, exiba cada mesclag
#: en/rev-list-options.txt:683
#, priority:260
msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
-msgstr ""
-"Quando a mesclagem de um commit é incluso através da opção `--show-pulls`, a "
-"mesclagem é tratada como tivesse \"capturado\" as alterações de um outro "
-"ramo. Ao usar a opção `--show-pulls` nest exemplo (e em nenhuma outra opção) "
-"o grafo resultante será:"
+msgstr "Quando a mesclagem de um commit é incluso através da opção `--show-pulls`, a mesclagem é tratada como tivesse \"capturado\" as alterações de um outro ramo. Ao usar a opção `--show-pulls` nest exemplo (e em nenhuma outra opção) o grafo resultante será:"
#. type: delimited block -
#: en/rev-list-options.txt:686
@@ -65789,11 +65165,7 @@ msgstr ""
#: en/rev-list-options.txt:746
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one."
-msgstr ""
-"teria aproximadamente o mesmo comprimento. Descobrir qual a alteração que "
-"apresenta uma regressão se resume, assim, a uma busca binária: gerar e "
-"testar repetidamente novos 'pontos médios' até que a sequência de commits "
-"seja de comprimento um."
+msgstr "teria aproximadamente o mesmo comprimento. Descobrir qual a alteração que apresenta uma regressão se resume, assim, a uma busca binária: gerar e testar repetidamente novos 'pontos médios' até que a sequência de commits seja de comprimento um."
#. type: Labeled list
#: en/rev-list-options.txt:747
@@ -69055,6 +68427,158 @@ 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 "Boolean true literals are `yes`, `on`, `true`,"
+#~ msgstr "Os literais booleanos verdadeiros são `yes`, `on`, `true`,"
+
+#~ msgid "`0` and the empty string.\n"
+#~ msgstr "`0` e uma cadeia de caracteres vazios.\n"
+
+#~ msgid "The Git repository to import to. If the directory doesn't"
+#~ msgstr "O repositório Git para o qual irá importar. Se o diretório não"
+
+#~ msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
+#~ msgstr "Reescreva as IDs dos objetos para o submódulo definido pelo <nome> vindo dos valores"
+
+#~ msgid "active_branches = 1 cur, 5 max\n"
+#~ msgstr "active_branches = 1 cur, 5 max\n"
+
+#~ msgid ""
+#~ "Inactive Branches\n"
+#~ "-----------------\n"
+#~ "refs/heads/master:\n"
+#~ msgstr ""
+#~ "Ramos Inativos\n"
+#~ "--------------\n"
+#~ "refs/heads/master:\n"
+
+#~ msgid ""
+#~ "Empty commits\n"
+#~ "~~~~~~~~~~~~~\n"
+#~ msgstr ""
+#~ "Commits vazios\n"
+#~ "~~~~~~~~~~~~~\n"
+
+#~ msgid ""
+#~ "Context\n"
+#~ "~~~~~~~\n"
+#~ msgstr ""
+#~ "Contexto\n"
+#~ "~~~~~~~~\n"
+
+#~ msgid ""
+#~ "Hooks\n"
+#~ "~~~~~\n"
+#~ msgstr ""
+#~ "Ganchos\n"
+#~ "~~~~~~~\n"
+
+#~ msgid ""
+#~ "Commit Rewording\n"
+#~ "~~~~~~~~~~~~~~~~\n"
+#~ msgstr ""
+#~ "Reformulando o Commit\n"
+#~ "~~~~~~~~~~~~~~~~~~~~~\n"
+
+#~ msgid "include::merge-strategies.txt[]\n"
+#~ msgstr "include::merge-strategies.txt[]\n"
+
+#~ msgid "NOTES\n"
+#~ msgstr "OBSERVAÇÕES\n"
+
+#~ msgid "the commit recorded in the superproject will be"
+#~ msgstr "o commit registrado no superprojeto será"
+
+#~ msgid "checked out in the submodule on a detached HEAD.\n"
+#~ msgstr "verificado no submódulo em um HEAD desanexado.\n"
+
+#~ msgid "onto the commit recorded in the superproject.\n"
+#~ msgstr "no commit registrado no superprojeto.\n"
+
+#~ msgid "into the current branch in the submodule.\n"
+#~ msgstr "na ramificação atual no submódulo.\n"
+
+#~ msgid "arbitrary shell command that takes a single"
+#~ msgstr "comando shell arbitrário que utiliza um único"
+
+#~ msgid "contents of <old|new>,\n"
+#~ msgstr "conteúdo do <antigo|novo>,\n"
+
+#~ msgid "the objects."
+#~ msgstr "os objetos."
+
+#~ msgid "'git update-index' continue anyway."
+#~ msgstr "'git update-index' continue mesmo assim."
+
+#~ msgid "If --refresh finds unmerged changes in the index, the default"
+#~ msgstr "Caso a opção `--refresh` encontre alterações não mescladas no índice, é a predefinição"
+
+#~ msgid "behavior is to error out. This option makes 'git update-index'"
+#~ msgstr "o comportamento gerar um erro. Está opção faz 'git update-index'"
+
+#~ msgid "continue anyway.\n"
+#~ msgstr "continue mesmo assim.\n"
+
+#~ msgid "color specification, as described under Values in the"
+#~ msgstr "definições das cores, conforme descrito em Valores no"
+
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "make the next placeholder take at"
+#~ msgstr "faça com que o próximo espaço reservado leve em"
+
+#~ msgid "columns, padding spaces on the right if necessary"
+#~ msgstr "colunas, preenchimento de espaços à direita se necessário"
+
+#~ msgid "but padding spaces on the left"
+#~ msgstr "mas com espaços de preenchimento à esquerda"
+
+#~ msgid "similar to '%>(<N>)', '%>|(<N>)'"
+#~ msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
+
+#~ msgid "similar to '%<(<N>)', '%<|(<N>)'"
+#~ msgstr "semelhante a '%<(<N>)', '%<|(<N>)'"
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "ou linkgit:git-blame[1])"
+
+#~ msgid "author local-part (see '%al') respecting .mailmap, see"
+#~ msgstr "parte local do autor (consulte '%al') respeitando .mailmap, consulte"
+
+#~ msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
+
+#~ msgid "committer name (respecting .mailmap, see"
+#~ msgstr "nome de quem fez o commit (respeitando .mailmap, consulte"
+
+#~ msgid "committer email (respecting .mailmap, see"
+#~ msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
+
+#~ msgid "(like `git log --source`), only works with `git log`"
+#~ msgstr "(como `git log --source`), só funciona com `git log`"
+
+#~ msgid "show \"G\" for a good (valid) signature,"
+#~ msgstr "exibe \"G\" para obter uma boa assinatura (válida),"
+
+#~ msgid "to sign a signed commit"
+#~ msgstr "para assinar um commit assinado"
+
+#~ msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
+#~ msgstr "seletor do \"reflog\", por exemplo, `refs/stash@{1}` ou `refs/stash@{2"
+
+#~ msgid "shortened reflog selector; same as `%gD`, but the refname"
+#~ msgstr "seletor do reflog encurtado; o mesmo que '%gD', menos o \"refname\""
+
+#~ msgid "reflog identity name (respecting .mailmap, see"
+#~ msgstr "nome da identidade reflog (respeitando .mailmap, consulte"
+
+#~ msgid "reflog identity email (respecting .mailmap, see"
+#~ msgstr "e-mail da identidade reflog (respeitando .mailmap, consulte"
+
+#~ msgid "display the trailers of the body as"
+#~ msgstr "exiba os sinais de resposta no corpo da mensagem como"
+
#~ msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up to date, it is flagged as an error. This flag also causes the index file to be updated."
#~ msgstr "Quando a opção `--check` estiver em vigor ou durante a aplicação do patch (que é a predefinição quando nenhuma das opções que o desabilita estiver em vigor), tenha certeza que o patch seja aplicável ao que o arquivo atual do índice registra. Caso o arquivo que será corrigido na árvore de trabalho não esteja atualizado, será sinalizado como um erro. Essa flag também faz com que o arquivo do índice seja atualizado."
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 5e2cd85..29f58f2 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-02-08 19:43+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: pt_PT\n"
@@ -2434,18 +2434,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2454,16 +2446,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9824,7 +9810,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17050,16 +17036,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20613,16 +20593,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22446,17 +22420,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22472,18 +22441,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25818,7 +25781,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39704,283 +39667,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49234,16 +49075,10 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49258,28 +49093,16 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49294,20 +49117,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53544,16 +53357,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54384,16 +54191,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54492,16 +54293,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54516,22 +54311,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59468,16 +59251,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59499,33 +59276,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59534,16 +59299,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59552,16 +59311,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59570,16 +59323,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59588,16 +59335,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59697,17 +59438,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -59727,9 +59462,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59751,15 +59486,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59865,9 +59594,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59889,9 +59618,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59913,9 +59642,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60026,16 +59755,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60122,16 +59845,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60176,16 +59893,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60206,16 +59917,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60224,16 +59929,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60255,9 +59954,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60279,9 +59978,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60302,16 +60001,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65605,6 +65298,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 6cff155..4f8792a 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,13 +5,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-09-27 02:40+0000\n"
"Last-Translator: Череп Черепович <cranium256@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.3-dev\n"
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9860,7 +9846,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17106,16 +17092,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20680,16 +20660,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22513,17 +22487,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22539,18 +22508,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25896,7 +25859,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39808,283 +39771,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49358,16 +49199,10 @@ msgstr ""
msgid "checkout"
msgstr "checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49382,28 +49217,16 @@ msgstr ""
msgid "rebase"
msgstr "rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49418,20 +49241,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53676,16 +53489,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54516,16 +54323,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54624,16 +54425,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54648,22 +54443,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59607,16 +59390,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59638,33 +59415,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59673,16 +59438,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59691,16 +59450,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59709,16 +59462,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59727,16 +59474,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59836,16 +59577,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "или linkgit:git-blame[1]"
+#: en/pretty-formats.txt:180
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59866,10 +59602,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59890,15 +59627,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
-#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:186
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
@@ -60004,10 +59736,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -60028,10 +59761,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -60052,10 +59786,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60165,16 +59900,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60261,16 +59990,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60315,16 +60038,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60345,16 +60062,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60363,16 +60074,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60394,10 +60099,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60418,10 +60124,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-shortlog[1] или linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60441,16 +60148,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65744,6 +65445,13 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "или linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 7da1131..da4efc5 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-11 09:26+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-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.3-dev\n"
@@ -213,12 +213,7 @@ msgstr "--date <biçim>"
#: en/blame-options.txt:78
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
-msgstr ""
-"Tarihleri yazdırmak için kullanılan biçimi belirtir. --date sağlanmazsa, "
-"blame.date yapılandırma değişkeninin değeri kullanılır. blame.date "
-"yapılandırma değişkeni de ayarlanmadıysa, iso biçimi kullanılır. Desteklenen "
-"değerler için --date seçeneğiyle ilgili linkgit:git-log[1]'daki tartışmaya "
-"bakın."
+msgstr "Tarihleri yazdırmak için kullanılan biçimi belirtir. --date sağlanmazsa, blame.date yapılandırma değişkeninin değeri kullanılır. blame.date yapılandırma değişkeni de ayarlanmadıysa, iso biçimi kullanılır. Desteklenen değerler için --date seçeneğiyle ilgili linkgit:git-log[1]'daki tartışmaya bakın."
#. type: Labeled list
#: en/blame-options.txt:79 en/git-fsck.txt:100
@@ -650,9 +645,7 @@ msgstr "linkgit:git-cvsimport[1]"
#: en/cmds-foreignscminterface.txt:9
#, priority:100
msgid "Salvage your data out of another SCM people love to hate."
-msgstr ""
-"Verilerinizi, insanların nefret etmeyi sevdiği başka bir kaynak kodu yönetim "
-"sisteminden kurtarın."
+msgstr "Verilerinizi, insanların nefret etmeyi sevdiği başka bir kaynak kodu yönetim sisteminden kurtarın."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
@@ -1024,8 +1017,7 @@ msgstr "linkgit:git-mv[1]"
#: en/cmds-mainporcelain.txt:72
#, priority:100
msgid "Move or rename a file, a directory, or a symlink."
-msgstr ""
-"Bir dosyayı, dizini ya da simgesel bağlantıyı taşı veya yeniden adlandır."
+msgstr "Bir dosyayı, dizini ya da simgesel bağlantıyı taşı veya yeniden adlandır."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:73
@@ -1229,8 +1221,7 @@ msgstr "linkgit:git-tag[1]"
#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
-msgstr ""
-"GPG ile imzalanmış bir etiket nesnesi oluştur, listele, sil veya doğrula."
+msgstr "GPG ile imzalanmış bir etiket nesnesi oluştur, listele, sil veya doğrula."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:124
@@ -2445,18 +2436,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2465,16 +2448,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9839,7 +9816,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17060,16 +17037,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20033,9 +20004,7 @@ msgstr ""
#: en/git-diff.txt:213
#, 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]"
+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]"
#. type: Title =
#: en/git-fast-export.txt:2
@@ -20624,16 +20593,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--rewrite-submodules-to=<ad>:<dosya>"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22457,17 +22420,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22483,18 +22441,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25825,7 +25777,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39700,283 +39652,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point ve --root"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49230,16 +49061,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49254,28 +49079,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49290,20 +49103,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53538,16 +53341,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54378,16 +54175,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54486,16 +54277,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54510,22 +54295,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59451,16 +59224,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59482,33 +59249,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59517,16 +59272,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59535,16 +59284,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59553,16 +59296,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59571,16 +59308,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59680,15 +59411,9 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "or linkgit:git-blame[1])"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59710,9 +59435,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59734,15 +59459,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59848,9 +59567,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59872,9 +59591,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59896,9 +59615,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60009,16 +59728,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60105,16 +59818,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60159,16 +59866,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60189,16 +59890,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60207,16 +59902,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60238,9 +59927,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60262,9 +59951,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60285,16 +59974,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65585,6 +65268,10 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 117785d..cdb468f 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-16 19:26+0000\n"
"Last-Translator: Alex Zhao <zhao.zhiyuan115@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1385,8 +1385,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
-# 查找给定版本的符号名称
#. type: Plain text
+# 查找给定版本的符号名称
#: en/cmds-plumbinginterrogators.txt:36
#, priority:100
msgid "Find symbolic names for given revs."
@@ -2437,18 +2437,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2457,16 +2449,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -6449,8 +6435,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
#, no-wrap, priority:300
msgid "modified content"
@@ -9891,7 +9877,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -13690,9 +13676,7 @@ msgstr "将存储库克隆到新创建的目录中，为克隆存储库中的每
#: en/git-clone.txt:36
#, priority:300
msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
-msgstr ""
-"克隆后，执行不带参数的`git fetch`命令将更新所有远程跟踪的分支，执行不带参数的`git "
-"pull`命令将另把远程master分支合并到当前master分支（如果存在）（如果附加“--single-branch”参数，则情况不同；请参阅下文）。"
+msgstr "克隆后，执行不带参数的`git fetch`命令将更新所有远程跟踪的分支，执行不带参数的`git pull`命令将另把远程master分支合并到当前master分支（如果存在）（如果附加“--single-branch”参数，则情况不同；请参阅下文）。"
#. type: Plain text
#: en/git-clone.txt:41
@@ -13846,11 +13830,7 @@ msgstr "--bare"
#: en/git-clone.txt:159
#, priority:300
msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
-msgstr ""
-"创建一个“纯”Git存储库。也就是说，不要创建 `<directory>` 并将管理文件放在 `<directory>/.git`，而是将 "
-"`<directory>` 本身设为`$GIT_DIR`。这显然暗含着 `--no-checkout` "
-"选项，因为没有地方可以检出工作树。此外，远程的分支头直接复制到相应的本地分支头，而不将它们映射到 `refs/remotes/origin/"
-"`。使用此选项时，不会创建远程跟踪分支或相关配置变量。"
+msgstr "创建一个“纯”Git存储库。也就是说，不要创建 `<directory>` 并将管理文件放在 `<directory>/.git`，而是将 `<directory>` 本身设为`$GIT_DIR`。这显然暗含着 `--no-checkout` 选项，因为没有地方可以检出工作树。此外，远程的分支头直接复制到相应的本地分支头，而不将它们映射到 `refs/remotes/origin/`。使用此选项时，不会创建远程跟踪分支或相关配置变量。"
#. type: Labeled list
#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490
@@ -13874,11 +13854,7 @@ msgstr "--filter=<过滤器定义>"
#: en/git-clone.txt:175
#, priority:300
msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"使用部分克隆功能，要求服务器根据给定的对象过滤器发送一个可到达的对象的子集。当使用 `--filter` 选项时，提供的 `<filter-spec>` "
-"将被用于部分克隆过滤器。例如，`--filter=blob:none` 将过滤掉所有的数据对象（文件内容），直到 Git "
-"需要相应的数据。另外，`--filter=blob:limit=<size>` 将过滤掉所有文件大小至少为 `<size>` "
-"的数据对象。关于过滤器定义的更多细节，请参阅 linkgit:git-rev-list[1] 中的 `--filter` 选项。"
+msgstr "使用部分克隆功能，要求服务器根据给定的对象过滤器发送一个可到达的对象的子集。当使用 `--filter` 选项时，提供的 `<filter-spec>` 将被用于部分克隆过滤器。例如，`--filter=blob:none` 将过滤掉所有的数据对象（文件内容），直到 Git 需要相应的数据。另外，`--filter=blob:limit=<size>` 将过滤掉所有文件大小至少为 `<size>` 的数据对象。关于过滤器定义的更多细节，请参阅 linkgit:git-rev-list[1] 中的 `--filter` 选项。"
#. type: Labeled list
#: en/git-clone.txt:176 en/git-push.txt:161
@@ -17167,16 +17143,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20731,16 +20701,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr "--recurse-submodules[=<路径规范]"
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22564,17 +22528,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22590,18 +22549,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25936,7 +25889,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -39838,283 +39791,161 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+msgid "Empty commits"
+msgstr "`commit`"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49373,16 +49204,10 @@ msgstr ""
msgid "checkout"
msgstr "--checkout"
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49397,28 +49222,16 @@ msgstr ""
msgid "rebase"
msgstr "--rebase"
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49433,20 +49246,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53688,16 +53491,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54528,16 +54325,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54636,16 +54427,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54660,22 +54445,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59612,16 +59385,10 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59643,33 +59410,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59678,16 +59433,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59696,16 +59445,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59714,16 +59457,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59732,16 +59469,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59841,17 +59572,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
+#: en/pretty-formats.txt:180
#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
-#, fuzzy, priority:260
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
-
#. type: Labeled list
#: en/pretty-formats.txt:180
#, ignore-same, no-wrap, priority:260
@@ -59871,9 +59596,9 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
+#: en/pretty-formats.txt:183
#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -59895,15 +59620,9 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, priority:260
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60009,9 +59728,9 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
+#: en/pretty-formats.txt:196
#, priority:260
-msgid "committer name (respecting .mailmap, see"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60033,9 +59752,9 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
+#: en/pretty-formats.txt:199
#, priority:260
-msgid "committer email (respecting .mailmap, see"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60057,9 +59776,9 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
+#: en/pretty-formats.txt:202
#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60170,16 +59889,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60266,16 +59979,10 @@ msgstr ""
msgid "'%G?'"
msgstr "'%GG'"
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60320,16 +60027,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60350,16 +60051,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60368,16 +60063,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60399,9 +60088,9 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
+#: en/pretty-formats.txt:247
#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60423,9 +60112,9 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
+#: en/pretty-formats.txt:250
#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -60446,16 +60135,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65758,6 +65441,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index dd52278..a2b680a 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: 2020-10-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-26 22:55+0100\n"
"PO-Revision-Date: 2020-10-14 05:26+0000\n"
"Last-Translator: 維維狐 <appiedavid777@gmail.com>\n"
"Language-Team: French\n"
@@ -2438,18 +2438,10 @@ msgstr ""
msgid "true"
msgstr ""
-#. type: Plain text
-#: en/config.txt:245
-#, priority:100
-msgid "Boolean true literals are `yes`, `on`, `true`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:247
-#, no-wrap, priority:100
-msgid ""
-"and `1`. Also, a variable defined without `= <value>`\n"
-"is taken as true.\n"
+#, priority:100
+msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
@@ -2458,16 +2450,10 @@ msgstr ""
msgid "false"
msgstr ""
-#. type: Plain text
-#: en/config.txt:249
-#, priority:100
-msgid "Boolean false literals are `no`, `off`, `false`,"
-msgstr ""
-
#. type: Plain text
#: en/config.txt:250
-#, no-wrap, priority:100
-msgid "`0` and the empty string.\n"
+#, priority:100
+msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
@@ -9835,7 +9821,7 @@ msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
msgstr ""
@@ -17062,16 +17048,10 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
-#. type: Plain text
-#: en/git-cvsimport.txt:69
-#, priority:100
-msgid "The Git repository to import to. If the directory doesn't"
-msgstr ""
-
#. type: Plain text
#: en/git-cvsimport.txt:70
-#, no-wrap, priority:100
-msgid "exist, it will be created. Default is the current directory.\n"
+#, priority:100
+msgid "The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory."
msgstr ""
#. type: Labeled list
@@ -20625,16 +20605,10 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
-#. type: Plain text
-#: en/git-fast-import.txt:131
-#, priority:100
-msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-
#. type: Plain text
#: en/git-fast-import.txt:134
#, priority:100
-msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
msgstr ""
#. type: Plain text
@@ -22458,17 +22432,12 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1320
+#: en/git-fast-import.txt:1321
#, no-wrap, priority:100
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1321
-#, no-wrap, priority:100
-msgid "active_branches = 1 cur, 5 max\n"
+"active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -22484,18 +22453,12 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1329
+#: en/git-fast-import.txt:1335
#, no-wrap, priority:100
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
-msgstr ""
-
-#. type: delimited block =
-#: en/git-fast-import.txt:1335
-#, no-wrap, priority:100
-msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -25832,7 +25795,7 @@ msgstr ""
#, no-wrap, priority:100
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
@@ -29433,9 +29396,7 @@ msgstr ""
#: en/git-init.txt:25
#, priority:300
msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
-msgstr ""
-"這行指令會創建一個空的Git倉儲，基本上是一個名為`.git`的目錄，含有`objects`,`refs/heads`,`refs/"
-"tags`這幾個子目錄，其他模板檔案，跟一個指向`master`分支Head的初始`HEAD`檔案。"
+msgstr "這行指令會創建一個空的Git倉儲，基本上是一個名為`.git`的目錄，含有`objects`,`refs/heads`,`refs/tags`這幾個子目錄，其他模板檔案，跟一個指向`master`分支Head的初始`HEAD`檔案。"
#. type: Plain text
#: en/git-init.txt:28
@@ -29453,9 +29414,7 @@ msgstr "如果object儲存路徑有經由環境變數`$GIT_OBJECT_DIRECTORY`所
#: en/git-init.txt:38
#, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
-msgstr ""
-"在現有的倉儲執行'git init'是很安全的。它並不會覆蓋掉已存在的檔案。重新執行'git init'最主要的原因，是去取得新增的模板檔案(或是加上 "
-"--separate-git-dir 將倉儲移到另一個位置)。"
+msgstr "在現有的倉儲執行'git init'是很安全的。它並不會覆蓋掉已存在的檔案。重新執行'git init'最主要的原因，是去取得新增的模板檔案(或是加上 --separate-git-dir 將倉儲移到另一個位置)。"
#. type: Plain text
#: en/git-init.txt:46
@@ -29491,9 +29450,7 @@ msgstr "指定用於取得模板檔案的目錄(請參考下面的\"模板檔案
#: en/git-init.txt:70
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
-msgstr ""
-"不使用`$GIT_DIR`或是`./.git/"
-"`作為初始化倉儲的路徑，而是創建一個儲存實際倉儲路徑的檔案。這個檔案會作為資料系統獨立的Git捷徑，連結到倉儲。"
+msgstr "不使用`$GIT_DIR`或是`./.git/`作為初始化倉儲的路徑，而是創建一個儲存實際倉儲路徑的檔案。這個檔案會作為資料系統獨立的Git捷徑，連結到倉儲。"
#. type: Plain text
#: en/git-init.txt:72
@@ -29530,10 +29487,7 @@ msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#: en/git-init.txt:87
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
-msgstr ""
-"指定的Git倉儲可在多個使用者之間共享，這會允許屬於相同群組的使用者對這個倉儲推送。指定時，組態參數\"core."
-"sharedRepository\"將會被設定"
-"，讓在`$GIT_DIR`底下的檔案和目錄使用指定的權限來創建。當沒有指定時，Git會使用umask(2)所回報的權限。"
+msgstr "指定的Git倉儲可在多個使用者之間共享，這會允許屬於相同群組的使用者對這個倉儲推送。指定時，組態參數\"core.sharedRepository\"將會被設定，讓在`$GIT_DIR`底下的檔案和目錄使用指定的權限來創建。當沒有指定時，Git會使用umask(2)所回報的權限。"
#. type: Plain text
#: en/git-init.txt:90
@@ -29563,10 +29517,7 @@ msgstr "'group' (或是 'true')"
#: en/git-init.txt:105
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
-msgstr ""
-"讓倉儲變成群組可寫入(還有g+sx，因為git群組可能並非所有使用者的主群組)。這用於放寬原本較為安全的umask(2)權限。請注意，umask仍然會適用"
-"於其他權限(舉例來說， 當umask是'0022'時,使用'group'並不會移除其他使用者(non-"
-"group)的讀取權限。請參閱'0xxx'來知道如何精確指定倉庫的權限。"
+msgstr "讓倉儲變成群組可寫入(還有g+sx，因為git群組可能並非所有使用者的主群組)。這用於放寬原本較為安全的umask(2)權限。請注意，umask仍然會適用於其他權限(舉例來說， 當umask是'0022'時,使用'group'並不會移除其他使用者(non-group)的讀取權限。請參閱'0xxx'來知道如何精確指定倉庫的權限。"
#. type: Labeled list
#: en/git-init.txt:106
@@ -29590,9 +29541,7 @@ msgstr "'0xxx'"
#: en/git-init.txt:117
#, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
-msgstr ""
-"'0xxx' 是個八進位數字，而各個檔案都會擁有權限'0xxx'。'0xxx'會覆蓋掉使用者的umask(2)值(而且並不像group跟all一樣會放寬權"
-"限)。'0640'會創建群組可讀，但群組不可寫，其他人也不可存取的倉儲。'0660'會創建當前使用者與群組可讀可寫，但是其他人無法存取的倉儲。"
+msgstr "'0xxx' 是個八進位數字，而各個檔案都會擁有權限'0xxx'。'0xxx'會覆蓋掉使用者的umask(2)值(而且並不像group跟all一樣會放寬權限)。'0640'會創建群組可讀，但群組不可寫，其他人也不可存取的倉儲。'0660'會創建當前使用者與群組可讀可寫，但是其他人無法存取的倉儲。"
#. type: Plain text
#: en/git-init.txt:122
@@ -39741,283 +39690,162 @@ msgstr ""
msgid "--fork-point and --root"
msgstr "--fork-point"
-#. type: Plain text
+#. type: Title -
#: en/git-rebase.txt:666
-#, priority:100
+#, no-wrap, priority:100
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:675
-#, no-wrap, priority:100
-msgid ""
-"git rebase has two primary backends: apply and merge. (The apply\n"
-"backend used to be known as the 'am' backend, but the name led to\n"
-"confusion as it looks like a verb instead of a noun. Also, the merge\n"
-"backend used to be known as the interactive backend, but it is now\n"
-"used for non-interactive cases as well. Both were renamed based on\n"
-"lower-level functionality that underpinned each.) There are some\n"
-"subtle differences in how these two backends behave:\n"
+#, priority:100
+msgid "git rebase has two primary backends: apply and merge. (The apply backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the merge backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:678
-#, no-wrap, priority:100
-msgid ""
-"Empty commits\n"
-"~~~~~~~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:677
+#, fuzzy, no-wrap, priority:100
+#| msgid "git-p4.keepEmptyCommits"
+msgid "Empty commits"
+msgstr "git-p4.keepEmptyCommits"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:683
-#, no-wrap, priority:100
-msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e.\n"
-"commits that started empty, though these are rare in practice. It\n"
-"also drops commits that become empty and has no option for controlling\n"
-"this behavior.\n"
+#, priority:100
+msgid "The apply backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:687
-#, no-wrap, priority:100
-msgid ""
-"The merge backend keeps intentionally empty commits by default (though\n"
-"with -i they are marked as empty in the todo list editor, or they can\n"
-"be dropped automatically with --no-keep-empty).\n"
+#, priority:100
+msgid "The merge backend keeps intentionally empty commits by default (though with -i they are marked as empty in the todo list editor, or they can be dropped automatically with --no-keep-empty)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:693
-#, no-wrap, priority:100
-msgid ""
-"Similar to the apply backend, by default the merge backend drops\n"
-"commits that become empty unless -i/--interactive is specified (in\n"
-"which case it stops and asks the user what to do). The merge backend\n"
-"also has an --empty={drop,keep,ask} option for changing the behavior\n"
-"of handling commits that become empty.\n"
+#, priority:100
+msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless -i/--interactive is specified (in which case it stops and asks the user what to do). The merge backend also has an --empty={drop,keep,ask} option for changing the behavior of handling commits that become empty."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:696
+#. type: Title ~
+#: en/git-rebase.txt:695
#, no-wrap, priority:100
-msgid ""
-"Directory rename detection\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Directory rename detection"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:705
-#, no-wrap, priority:100
-msgid ""
-"Due to the lack of accurate tree information (arising from\n"
-"constructing fake ancestors with the limited information available in\n"
-"patches), directory rename detection is disabled in the apply backend.\n"
-"Disabled directory rename detection means that if one side of history\n"
-"renames a directory and the other adds new files to the old directory,\n"
-"then the new files will be left behind in the old directory without\n"
-"any warning at the time of rebasing that you may want to move these\n"
-"files into the new directory.\n"
+#, priority:100
+msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:708
-#, no-wrap, priority:100
-msgid ""
-"Directory rename detection works with the merge backend to provide you\n"
-"warnings in such cases.\n"
+#, priority:100
+msgid "Directory rename detection works with the merge backend to provide you warnings in such cases."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:711
-#, no-wrap, priority:100
-msgid ""
-"Context\n"
-"~~~~~~~\n"
-msgstr ""
+#. type: Title ~
+#: en/git-rebase.txt:710
+#, fuzzy, no-wrap, priority:100
+#| msgid "--text"
+msgid "Context"
+msgstr "--text"
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:726
-#, no-wrap, priority:100
-msgid ""
-"The apply backend works by creating a sequence of patches (by calling\n"
-"`format-patch` internally), and then applying the patches in sequence\n"
-"(calling `am` internally). Patches are composed of multiple hunks,\n"
-"each with line numbers, a context region, and the actual changes. The\n"
-"line numbers have to be taken with some fuzz, since the other side\n"
-"will likely have inserted or deleted lines earlier in the file. The\n"
-"context region is meant to help find how to adjust the line numbers in\n"
-"order to apply the changes to the right lines. However, if multiple\n"
-"areas of the code have the same surrounding lines of context, the\n"
-"wrong one can be picked. There are real-world cases where this has\n"
-"caused commits to be reapplied incorrectly with no conflicts reported.\n"
-"Setting diff.context to a larger value may prevent such types of\n"
-"problems, but increases the chance of spurious conflicts (since it\n"
-"will require more lines of matching context to apply).\n"
+#, priority:100
+msgid "The apply backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting diff.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:729
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with a full copy of each relevant file,\n"
-"insulating it from these types of problems.\n"
+#, priority:100
+msgid "The merge backend works with a full copy of each relevant file, insulating it from these types of problems."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:732
+#. type: Title ~
+#: en/git-rebase.txt:731
#, no-wrap, priority:100
-msgid ""
-"Labelling of conflicts markers\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Labelling of conflicts markers"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:743
-#, no-wrap, priority:100
-msgid ""
-"When there are content conflicts, the merge machinery tries to\n"
-"annotate each side's conflict markers with the commits where the\n"
-"content came from. Since the apply backend drops the original\n"
-"information about the rebased commits and their parents (and instead\n"
-"generates new fake commits based off limited information in the\n"
-"generated patches), those commits cannot be identified; instead it has\n"
-"to fall back to a commit summary. Also, when merge.conflictStyle is\n"
-"set to diff3, the apply backend will use \"constructed merge base\" to\n"
-"label the content from the merge base, and thus provide no information\n"
-"about the merge base commit whatsoever.\n"
+#, priority:100
+msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:746
-#, no-wrap, priority:100
-msgid ""
-"The merge backend works with the full commits on both sides of history\n"
-"and thus has no such limitations.\n"
+#, priority:100
+msgid "The merge backend works with the full commits on both sides of history and thus has no such limitations."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:749
+#. type: Title ~
+#: en/git-rebase.txt:748
#, no-wrap, priority:100
-msgid ""
-"Hooks\n"
-"~~~~~\n"
+msgid "Hooks"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:762
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has not traditionally called the post-commit hook,\n"
-"while the merge backend has. Both have called the post-checkout hook,\n"
-"though the merge backend has squelched its output. Further, both\n"
-"backends only call the post-checkout hook with the starting point\n"
-"commit of the rebase, not the intermediate commits nor the final\n"
-"commit. In each case, the calling of these hooks was by accident of\n"
-"implementation rather than by design (both backends were originally\n"
-"implemented as shell scripts and happened to invoke other commands\n"
-"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
-"backends should have the same behavior, though it is not entirely\n"
-"clear which, if any, is correct. We will likely make rebase stop\n"
-"calling either of these hooks in the future.\n"
+#, priority:100
+msgid "The apply backend has not traditionally called the post-commit hook, while the merge backend has. Both have called the post-checkout hook, though the merge backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like 'git checkout' or 'git commit' that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:765
+#. type: Title ~
+#: en/git-rebase.txt:764
#, no-wrap, priority:100
-msgid ""
-"Interruptability\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Interruptability"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:773
-#, no-wrap, priority:100
-msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if\n"
-"the user presses Ctrl-C at the wrong time to try to abort the rebase,\n"
-"the rebase can enter a state where it cannot be aborted with a\n"
-"subsequent `git rebase --abort`. The merge backend does not appear to\n"
-"suffer from the same shortcoming. (See\n"
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for\n"
-"details.)\n"
+#, priority:100
+msgid "The apply backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The merge backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:776
+#. type: Title ~
+#: en/git-rebase.txt:775
#, no-wrap, priority:100
-msgid ""
-"Commit Rewording\n"
-"~~~~~~~~~~~~~~~~\n"
+msgid "Commit Rewording"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:783
-#, no-wrap, priority:100
-msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user\n"
-"to resolve. Since the user may need to make notable changes while\n"
-"resolving conflicts, after conflicts are resolved and the user has run\n"
-"`git rebase --continue`, the rebase should open an editor and ask the\n"
-"user to update the commit message. The merge backend does this, while\n"
-"the apply backend blindly applies the original commit message.\n"
+#, priority:100
+msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The merge backend does this, while the apply backend blindly applies the original commit message."
msgstr ""
-#. type: delimited block -
-#: en/git-rebase.txt:786
+#. type: Title ~
+#: en/git-rebase.txt:785
#, no-wrap, priority:100
-msgid ""
-"Miscellaneous differences\n"
-"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+msgid "Miscellaneous differences"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:790
-#, no-wrap, priority:100
-msgid ""
-"There are a few more behavioral differences that most folks would\n"
-"probably consider inconsequential but which are mentioned for\n"
-"completeness:\n"
+#, priority:100
+msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:"
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:794
-#, no-wrap, priority:100
-msgid ""
-"* Reflog: The two backends will use different wording when describing\n"
-" the changes made in the reflog, though both will make use of the\n"
-" word \"rebase\".\n"
+#, priority:100
+msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:800
-#, ignore-ellipsis, no-wrap, priority:100
-msgid ""
-"* Progress, informational, and error messages: The two backends\n"
-" provide slightly different progress and informational messages.\n"
-" Also, the apply backend writes error messages (such as \"Your files\n"
-" would be overwritten...\") to stdout, while the merge backend writes\n"
-" them to stderr.\n"
+#, ignore-ellipsis, priority:100
+msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/git-rebase.txt:803
-#, no-wrap, priority:100
-msgid ""
-"* State directories: The two backends keep their state in different\n"
-" directories under .git/\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:805
-#, no-wrap, priority:100
-msgid "include::merge-strategies.txt[]\n"
-msgstr ""
-
-#. type: delimited block -
-#: en/git-rebase.txt:807
-#, no-wrap, priority:100
-msgid "NOTES\n"
+#, priority:100
+msgid "State directories: The two backends keep their state in different directories under .git/"
msgstr ""
#. type: Plain text
@@ -49275,16 +49103,10 @@ msgstr ""
msgid "checkout"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:150
-#, priority:220
-msgid "the commit recorded in the superproject will be"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:151
-#, no-wrap, priority:220
-msgid "checked out in the submodule on a detached HEAD.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be checked out in the submodule on a detached HEAD."
msgstr ""
#. type: Plain text
@@ -49299,28 +49121,16 @@ msgstr ""
msgid "rebase"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:158
-#, priority:220
-msgid "the current branch of the submodule will be rebased"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:159
-#, no-wrap, priority:220
-msgid "onto the commit recorded in the superproject.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/git-submodule.txt:161
#, priority:220
-msgid "the commit recorded in the superproject will be merged"
+msgid "the current branch of the submodule will be rebased onto the commit recorded in the superproject."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-#, no-wrap, priority:220
-msgid "into the current branch in the submodule.\n"
+#, priority:220
+msgid "the commit recorded in the superproject will be merged into the current branch in the submodule."
msgstr ""
#. type: Plain text
@@ -49335,20 +49145,10 @@ msgstr ""
msgid "custom command"
msgstr ""
-#. type: Plain text
-#: en/git-submodule.txt:167
-#, priority:220
-msgid "arbitrary shell command that takes a single"
-msgstr ""
-
#. type: Plain text
#: en/git-submodule.txt:171
-#, no-wrap, priority:220
-msgid ""
-"argument (the sha1 of the commit recorded in the\n"
-"superproject) is executed. When `submodule.<name>.update`\n"
-"is set to '!command', the remainder after the exclamation mark\n"
-"is the custom command.\n"
+#, priority:220
+msgid "arbitrary shell command that takes a single argument (the sha1 of the commit recorded in the superproject) is executed. When `submodule.<name>.update` is set to '!command', the remainder after the exclamation mark is the custom command."
msgstr ""
#. type: Plain text
@@ -53591,16 +53391,10 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
-#. type: Plain text
-#: en/git.txt:564
-#, priority:100
-msgid "are files GIT_EXTERNAL_DIFF can use to read the"
-msgstr ""
-
#. type: Plain text
#: en/git.txt:565
-#, no-wrap, priority:100
-msgid "contents of <old|new>,\n"
+#, priority:100
+msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
msgstr ""
#. type: Labeled list
@@ -54431,16 +54225,10 @@ msgstr ""
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
-#. type: Plain text
-#: en/git-unpack-objects.txt:32
-#, priority:100
-msgid "Dry run. Check the pack file without actually unpacking"
-msgstr ""
-
#. type: Plain text
#: en/git-unpack-objects.txt:33
#, priority:100
-msgid "the objects."
+msgid "Dry run. Check the pack file without actually unpacking the objects."
msgstr ""
#. type: Plain text
@@ -54539,16 +54327,10 @@ msgstr ""
msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:62
-#, priority:100
-msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:63
#, priority:100
-msgid "'git update-index' continue anyway."
+msgid "Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -54563,22 +54345,10 @@ msgstr "--ignore-submodules"
msgid "Do not try to update submodules. This option is only respected when passed before --refresh."
msgstr ""
-#. type: Plain text
-#: en/git-update-index.txt:70
-#, priority:100
-msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-
-#. type: Plain text
-#: en/git-update-index.txt:71
-#, priority:100
-msgid "behavior is to error out. This option makes 'git update-index'"
-msgstr ""
-
#. type: Plain text
#: en/git-update-index.txt:72
-#, no-wrap, priority:100
-msgid "continue anyway.\n"
+#, priority:100
+msgid "If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes 'git update-index' continue anyway."
msgstr ""
#. type: Plain text
@@ -59518,16 +59288,10 @@ msgstr "color"
msgid "'%C(...)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:133
-#, priority:260
-msgid "color specification, as described under Values in the"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:146
#, ignore-ellipsis, priority:260
-msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
+msgid "color specification, as described under Values in the \"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
#. type: Labeled list
@@ -59549,33 +59313,21 @@ msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:148
+#: en/pretty-formats.txt:149
#, priority:260
-msgid "switch line wrapping, like the -w option of"
+msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:149
-#, ignore-same, priority:260
-msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]."
-
#. type: Labeled list
#: en/pretty-formats.txt:149
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:150
-#, priority:260
-msgid "make the next placeholder take at"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:157
#, priority:260
-msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
+msgid "make the next placeholder take at least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
#. type: Labeled list
@@ -59584,16 +59336,10 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:158
-#, priority:260
-msgid "make the next placeholder take at least until Nth"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:159
#, priority:260
-msgid "columns, padding spaces on the right if necessary"
+msgid "make the next placeholder take at least until Nth columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -59602,16 +59348,10 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:160
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
-msgid "but padding spaces on the left"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -59620,16 +59360,10 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:162
-#, priority:260
-msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:166
#, priority:260
-msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
+msgid "similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
#. type: Labeled list
@@ -59638,16 +59372,10 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:167
-#, priority:260
-msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:169
#, priority:260
-msgid "respectively, but padding both sides (i.e. the text is centered)"
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -59751,17 +59479,11 @@ msgid "'%aN'"
msgstr "'%aN'"
#. type: Plain text
-#: en/pretty-formats.txt:179
-#, priority:260
-msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+#: en/pretty-formats.txt:180
#, fuzzy, priority:260
-#| msgid "linkgit:git-blame[1]"
-msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59783,10 +59505,11 @@ msgid "'%aE'"
msgstr "'%aE'"
#. type: Plain text
-#: en/pretty-formats.txt:182
-#, priority:260
-msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+#: en/pretty-formats.txt:183
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59807,16 +59530,10 @@ msgid "'%aL'"
msgstr "'%aL'"
#. type: Plain text
-#: en/pretty-formats.txt:185
-#, priority:260
-msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
-
-#. type: Plain text
-#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+#: en/pretty-formats.txt:186
#, fuzzy, priority:260
#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
-msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgid "author local-part (see '%al') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
@@ -59924,10 +59641,11 @@ msgid "'%cN'"
msgstr "'%cN'"
#. type: Plain text
-#: en/pretty-formats.txt:195
-#, priority:260
-msgid "committer name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:196
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -59949,10 +59667,11 @@ msgid "'%cE'"
msgstr "'%cE'"
#. type: Plain text
-#: en/pretty-formats.txt:198
-#, priority:260
-msgid "committer email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:199
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -59973,10 +59692,11 @@ msgid "'%cL'"
msgstr "'%cL'"
#. type: Plain text
-#: en/pretty-formats.txt:201
-#, priority:260
-msgid "committer local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:202
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "committer local-part (see '%cl') respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -60087,16 +59807,10 @@ msgstr "'%D'"
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:212
-#, priority:260
-msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:213
#, priority:260
-msgid "(like `git log --source`), only works with `git log`"
+msgid "ref name given on the command line by which the commit was reached (like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -60185,16 +59899,10 @@ msgstr ""
msgid "'%G?'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:223
-#, priority:260
-msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:230
#, priority:260
-msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
+msgid "show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Labeled list
@@ -60239,16 +59947,10 @@ msgstr ""
msgid "'%GP'"
msgstr "'%GP'"
-#. type: Plain text
-#: en/pretty-formats.txt:234
-#, priority:260
-msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
-msgid "to sign a signed commit"
+msgid "show the fingerprint of the primary key whose subkey was used to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -60269,16 +59971,10 @@ msgstr ""
msgid "'%gD'"
msgstr "'%gD'"
-#. type: Plain text
-#: en/pretty-formats.txt:237
-#, priority:260
-msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:241
#, priority:260
-msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
#. type: Labeled list
@@ -60287,16 +59983,10 @@ msgstr ""
msgid "'%gd'"
msgstr "'%gd'"
-#. type: Plain text
-#: en/pretty-formats.txt:242
-#, priority:260
-msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:244
#, priority:260
-msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
+msgid "shortened reflog selector; same as `%gD`, but the refname portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
#. type: Labeled list
@@ -60318,10 +60008,11 @@ msgid "'%gN'"
msgstr "'%gN'"
#. type: Plain text
-#: en/pretty-formats.txt:246
-#, priority:260
-msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:247
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:247
@@ -60342,10 +60033,11 @@ msgid "'%gE'"
msgstr "'%gE'"
#. type: Plain text
-#: en/pretty-formats.txt:249
-#, priority:260
-msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+#: en/pretty-formats.txt:250
+#, fuzzy, priority:260
+#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgid "reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Labeled list
#: en/pretty-formats.txt:250
@@ -60365,16 +60057,10 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
-#. type: Plain text
-#: en/pretty-formats.txt:252
-#, priority:260
-msgid "display the trailers of the body as"
-msgstr ""
-
#. type: Plain text
#: en/pretty-formats.txt:256
#, priority:260
-msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
+msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
#. type: Plain text
@@ -65668,6 +65354,14 @@ msgstr ""
msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
msgstr ""
+#, ignore-same
+#~ msgid "linkgit:git-shortlog[1]."
+#~ msgstr "linkgit:git-shortlog[1]."
+
+#, fuzzy
+#~ msgid "or linkgit:git-blame[1])"
+#~ msgstr "linkgit:git-blame[1]"
+
#, fuzzy
#~ msgid "'git show-index'\n"
#~ msgstr "git-show-index(1)"
--
GitLab