From 2a299d33c61514ef4b4653a8ed6016f99e6e2058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Tue, 6 Apr 2021 23:38:21 +0200
Subject: [PATCH] update priorities setting and include management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr>
---
Makefile | 8 +-
po/documentation.de.po | 774 ++++++++++++------------
po/documentation.es.po | 774 ++++++++++++------------
po/documentation.es_MX.po | 774 ++++++++++++------------
po/documentation.fr.po | 973 +++++++++++++++++-------------
po/documentation.hu.po | 774 ++++++++++++------------
po/documentation.id.po | 774 ++++++++++++------------
po/documentation.is.po | 774 ++++++++++++------------
po/documentation.it.po | 774 ++++++++++++------------
po/documentation.ja.po | 774 ++++++++++++------------
po/documentation.ko.po | 774 ++++++++++++------------
po/documentation.mr.po | 774 ++++++++++++------------
po/documentation.nb_NO.po | 774 ++++++++++++------------
po/documentation.nl.po | 774 ++++++++++++------------
po/documentation.pl.po | 774 ++++++++++++------------
po/documentation.pt_BR.po | 1010 +++++++++++++++++++-------------
po/documentation.pt_PT.po | 774 ++++++++++++------------
po/documentation.ru.po | 810 +++++++++++++------------
po/documentation.sk.po | 776 ++++++++++++------------
po/documentation.tr.po | 774 ++++++++++++------------
po/documentation.zh_HANS-CN.po | 817 +++++++++++++-------------
po/documentation.zh_HANT.po | 774 ++++++++++++------------
scripts/set-priorities | 67 ++-
23 files changed, 8611 insertions(+), 8234 deletions(-)
diff --git a/Makefile b/Makefile
index 2698c51..51d972f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,13 +20,15 @@ po4a.conf: scripts/create_po4a_conf.sh sources.txt $(LANGUAGE_PO)
po4a-stamp: po4a.conf $(EN_SOURCES) $(LANGUAGE_PO) Makefile
$(QUIET_PO4A)PERL5LIB=./po4a/lib po4a/po4a -v po4a.conf
- for f in po/documentation.*.po; do ./scripts/pre-translate-po $$f; ./scripts/set-priorities $$f; done
+ for f in po/documentation.*.po; do ./scripts/pre-translate-po $$f; done
+ ./scripts/set-priorities po/documentation.*.po
@touch $@
update-sources:
- ./scripts/update-sources.sh
+ @./scripts/update-sources.sh
$(QUIET_PO4A)PERL5LIB=./po4a/lib po4a/po4a -v --no-translations po4a.conf
- for f in po/documentation.*.po; do ./scripts/pre-translate-po $$f; ./scripts/set-priorities $$f; done
+ @for f in po/documentation.*.po; do ./scripts/pre-translate-po $$f; done
+ @./scripts/set-priorities po/documentation.*.po
define MAKE_TARGET
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 19584f7..470f6a2 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -3626,55 +3626,55 @@ msgstr "Die zus채tzliche `NUL` vor dem Pre-Image-Pfad (falls eine Umbenennung vo
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/datei1 b/datei2\n"
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3691,43 +3691,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3739,25 +3739,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3770,7 +3770,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3785,7 +3785,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3800,37 +3800,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr " diff --cc Datei\n"
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3840,85 +3840,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6091,7 +6091,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6103,7 +6103,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -7093,7 +7093,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7166,7 +7166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7444,7 +7444,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8263,7 +8263,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9775,19 +9775,19 @@ msgstr "Siehe linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr "git-branch - Auflisten, Erzeugen oder L철schen von Entwicklungszweigen (branches)"
#. type: Plain text
#: en/git-branch.txt:26
-#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
#| msgid ""
#| "'git branch' [--color | --no-color] [-r | -a]\n"
#| "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
@@ -9821,182 +9821,182 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, fuzzy, priority:240
+#, fuzzy, priority:260
#| msgid "With no arguments, existing branches are listed, the current branch will be highlighted with an asterisk. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both."
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr "Wird der Befehl ohne Argumente aufgerufen, wird eine Liste der im Projektarchiv existierenden Entwicklungszweige (branches) ausgegeben, wobei der aktuelle Entwicklungszweig mit einem Sternchen ('*') hervorgehoben wird. die Option '-r' bewirkt, da횩 beobachtete Entwicklungszweige eines fernen Projektarchivs (remote tracking branches) angezeigt werden, bei '-a' werden beide Arten aufgelistet."
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr "Mittels '--contains' werden nur die Branches angezeigt, die den benannten Commit beinhalten (mit anderen Worten: die Branches, deren letzter Commit direkt oder indirekt darauf beruht), mit `--no-contains` das Gegenteil. Mit '--merged' werden alle Branches angezeigt, die in den benannten Commit zusammengef체hrt (merged) wurden (mit anderen Worten die Branches, die vom benannten Commit aus erreichbar sind). Mit '--no-merged' werden nur Branches angezeigt, die nicht in den angegebenen Commit zusammengef체hrt wurden. Gibt man das <Commit> Argument nicht an, wird standardm채횩ig 'HEAD' (also der letze Commit des aktuellen Branches) verwendet."
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr "Beachten Sie, dass dies einen neuen Branch anlegt, aber der aktuelle Arbeitsbereich nicht auf diesen umgeschaltet wird. Dies kann mit \"git switch <Neuer-Zweig>\" erreicht werden."
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr "Wird ein lokaler Branch von einem Remote-Tracking-Branch abgeleitet setzt Git diesen (insbesondere die Konfigurationseintr채ge `branch.<Name>.remote` und `branch.<Name>.merge`) so auf, dass 'git pull' einen ordnungsgem채횩en Merge vom Remote-Tracking-Branch durchf체hren kann. Dieses Verhalten kann global durch das 'branch.autosetupmerge' Konfigurationsflag ge채ndert werden. Diese Option kann durch Verwendung der Optionen '--track' und '--no-track' 체berschrieben und durch `git branch --set-upstream-to` nachtr채glich ge채ndert werden."
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr "Durch die Option `-m` oder `-M` wird <Alter-Zweig> in <Neuer-Zweig> umbenannt. Hat <Alter-Zweig> einen passendes Reflog (siehe linkgit:git-reflog[1]), wird es auf <Neuer-Zweig> umbenannt und zus채tzlich wird ein Reflog-Eintrag f체r die Umbenennung erzeugt. Existiert <Neuer-Zweig> bereits, muss `-M` verwendet werden um die Umbenennung zu erzwingen."
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr "Durch die Option `-d` oder `-D` wird `<Branchname>` gel철scht. Man kann auch mehr als einen zu l철schenden Branch angeben. Hat der Branch ein Reflog, dann wird dieses ebenfalls gel철scht."
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr "Wird `-r` gemeinsam mit `-d` verwendet, wird die Referenz auf den Remote-Tracking-Branch gel철scht. Dies macht nur dann Sinn, wenn der Branch im fernen Repository nicht mehr existiert, oder wenn 'git fetch' so konfiguriert wurde, dass dieser nicht mehr geholt wird. Siehe auch den 'prune'-Unterbefehl von linkgit:git-remote[1] um alle nicht mehr ben철tigten Remote-Tracking-Branches zu l철schen."
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr "Verschiebe/Umbenenne einen Branch und das zugeh철rige Reflog."
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr "-M"
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
msgid "Copy a branch and the corresponding reflog."
msgstr "Kopiere einen Branch und das zugeh철rige Reflog."
#. type: Plain text
#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr "-C"
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr "Zeige den aktuellen Branch, lokale Branches und Remote-Tracking-Branches in unterschiedlichen Farben an. M철gliche Werte sind always (immer, standardwert), never (niemals) oder auto."
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr "Schalte die farbige Ausgabe von Branches aus, auch wenn dies per Konfigurationsdatei eingeschaltet wurde. Identisch zu `--color=never`."
#. 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -10014,104 +10014,104 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr "Auflisten oder L철schen (wenn die '-d' Option gleichzeitig verwendet wird) der Referenzen auf Remote-Tracking-Branches. Kann mit `--list` kombiniert werden um nach optional(en) Muster(n) zu suchen."
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr "Zeige sowohl lokale wie auch Remote-Tracking-Branches an. Kann mit `--list` kombiniert werden um nach optional(en) Muster(n) zu suchen."
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, fuzzy, priority:240
+#, fuzzy, priority:260
#| msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr "횆ndere die minimale L채nge der auszugebenden Zeichen des sha1. Der Standardwert ist 7 und kann mit der Konfigurationsoption `core.abbrev` 체berschrieben werden."
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr "Zeige die volle L채nge des SHA1, anstatt ihn abzuk체rzen."
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, fuzzy, priority:240
+#, fuzzy, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
"#-#-#-#-# git-branch-de.po (PACKAGE VERSION) #-#-#-#-#\n"
@@ -10121,213 +10121,213 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr "Keine \"upstream\"-Konfiguration erstellen, auch wenn die Konfigurationsvariable branch.autoSetupMerge auf true gesetzt ist."
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr "--contains [<Commit>]"
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "Zeige nur die Branches an, die den angegebenen Commit enthalten (HEAD, falls nichts angegeben wird). Impliziert `--list`."
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr "--no-contains [<Commit>]"
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "Zeige nur die Branches an, die den angegebenen Commit nicht enthalten (HEAD, falls nichts angegeben wird). Impliziert `--list`."
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr "-merged [<Commit>]"
#. type: Plain text
#: en/git-branch.txt:258
-#, fuzzy, priority:240
+#, fuzzy, priority:260
#| 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 "Zeige nur die Branches an, deren Spitze vom angegebenen Commit erreichbar ist (HEAD, falls nichts angegeben wird). Impliziert `--list`, inkompatibel mit `--no-merged`."
#. type: Labeled list
#: en/git-branch.txt:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr "--no-merged [<Commit>]"
#. type: Plain text
#: en/git-branch.txt:262
-#, fuzzy, priority:240
+#, fuzzy, priority:260
#| 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 "Zeige nur die Branches an, deren Spitze vom angegebenen Commit nicht erreichbar ist (HEAD, falls nichts angegeben wird). Impliziert `--list`, inkompatibel mit `--merged`."
#. type: Labeled list
#: en/git-branch.txt:263
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr "<branchname>"
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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 "Der Name des Entwicklungszweiges (branch) der erzeugt oder gel철scht werden soll. Der Name mu횩 alle Pr체fungen die in linkgit:git-check-ref-format[1] definiert sind erf체llen. Dadurch k철nnen sich Einschr채nkungen in der im Namen des Entwicklungszweiges vorkommenden Zeichen ergeben."
#. type: Labeled list
#: en/git-branch.txt:269 en/git-switch.txt:42
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr "<start-point>"
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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 "Der neu erzeugte Branch wird auf diesen Commit verweisen, wobei es sich dabei um den Hash eines Commits, den Namen eines anderen Branches oder eine Markierung (tag) handeln kann. Wird dieser Parameter nicht angegeben, so wird der aktuelle HEAD als Ausgangspunkt verwendet."
#. type: Labeled list
#: en/git-branch.txt:274
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr "<Alter-Branch>"
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr "Der Name eines existierenden Entwicklungszweiges (branch) der umbenannt werden soll."
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<Neuer-Branch>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr "Der neue Name f체r einen existierenden Branch. Es gelten die gleichen Einschr채nkungen wie f체r <branchname>."
#. 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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr "--points-at <Objekt>"
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr "Zeige nur Branches des angegebenen Objekts an."
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr "--format <Format>"
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr "Weiterentwicklung ausgehend von einer bekannten Markierung (tag)"
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10341,19 +10341,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr "Dieser und der nachfolgende Schritt k철nnen in einem einzigen Befehl \"checkout -b my2.6.14 v2.6.14\" kombiniert werden."
#. type: Labeled list
#: en/git-branch.txt:322
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr "L철schen eines nicht mehr ben철tigten Entwicklungszweiges (Branch)"
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10367,25 +10367,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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 "L철sche die Remote-Tracking-Branches \"todo\", \"html\", \"man\". Das n채chste 'fetch' oder 'pull' wird diese wieder anlegen, au횩er man konfiguriert Git entsprechend. Siehe auch linkgit:git-fetch[1]."
#. type: Plain text
#: en/git-branch.txt:336
-#, priority:240
+#, priority:260
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 "L철sche den Branch \"test\", selbst dann wenn der \"master\" (oder der gerade aktive Branch) nicht alle Commits dieses Branches enth채lt."
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10393,67 +10393,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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 "Will man einen Branch erzeugen und sofort auf diesen wechseln, ist es einfacher dies in einem Schritt, durch Ausf체hren des Befehls \"git switch\" mit der `-c` Option, zu machen."
#. type: Plain text
#: en/git-branch.txt:359
-#, priority:240
+#, priority:260
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr "Die Optionen `--contains`, `--no-contains`, `--merged` und `--no-merged` erf체llen drei verwandte aber doch unterschiedliche Aufgaben:"
#. type: Plain text
#: en/git-branch.txt:363
-#, priority:240
+#, priority:260
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 "`--contains <Commit>` wird verwendet um alle Branches zu finden in denen <Commit> vorkommt, bevor dieser mit 'git commit --amend' oder 'git rebase' ver채ndert wird."
#. type: Plain text
#: en/git-branch.txt:366
-#, priority:240
+#, priority:260
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr "`--no-contains <Commit>` macht das Gegenteil davon, d.h. findet Branches, die <Commit> nicht enthalten."
#. type: Plain text
#: en/git-branch.txt:369
-#, priority:240
+#, priority:260
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr "`--merged` wird verwendet um festzustellen, welche Entwicklungszweige (branches) ohne Informationen zu verlieren gel철scht werden k철nnen, da diese sowieso vollst채ndig in HEAD enthalten sind."
#. type: Plain text
#: en/git-branch.txt:372
-#, priority:240
+#, priority:260
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 "`--no-merged` wird verwendet um Entwicklungszweige (branches) zu finden die Kandidaten f체r eine Zusammenf체hrung (merge) in den HEAD sind, da diese noch nicht vollst채ndig in HEAD beinhaltet sind."
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11547,7 +11547,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12419,13 +12419,13 @@ msgstr "Leise, unterdr체cke Hinweisnachrichten."
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr "Der Fortschritt wird standardm채횩ig auf der Standardfehlerausgabe angezeigt, wenn diese an ein Terminal angebunden ist, au횩er wenn `--quiet` angegeben ist. Dieses Flag erlaubt die Fortschrittsanzeige auch ohne Terminalanbindung, ohne `--quiet` zu ber체cksichtigen."
@@ -12443,13 +12443,13 @@ msgstr "Wenn Pfade aus dem Index ausgecheckt werden, sollte das Auschecken nicht
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12600,7 +12600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12642,13 +12642,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr "--conflict=<style>"
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 "Die gleiche Option, wie die Option `--merge` oben, aber sie 채ndert die Art, wie die widerspr체chlichen Teile dargestellt werden. Dabei wird die Konfigurationsvariable `-merge.conflictStyle` 체berschrieben. M철gliche Werte sind \"merge\" ( Vorgabe) und \"diff3\" (zus채tzlich zu dem, was der \"merge\"-Stil anzeigt, wird der origin채re Inhalt ausgegeben)."
@@ -12702,7 +12702,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12714,13 +12714,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12781,7 +12781,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -13041,7 +13041,7 @@ msgstr "Branch wechseln"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr "Lade eine Datei aus einem anderen Commit"
@@ -13593,7 +13593,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -16177,7 +16177,7 @@ msgstr "Bei Lese-Optionen: nur aus der Repository `.git/config` lesen, nicht aus
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16585,7 +16585,7 @@ msgstr "Sie k철nnen diese Regeln entweder mit Optionen auf der Kommandozeile ode
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr "ENVIRONMENT"
@@ -31875,7 +31875,7 @@ msgstr "Siehe linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34682,19 +34682,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34712,400 +34712,400 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "COMMANDS"
msgid "SUBCOMMANDS"
msgstr "COMMANDS"
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--add"
msgid "add"
msgstr "--add"
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--edit"
msgid "edit"
msgstr "--edit"
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "'show'"
msgid "show"
msgstr "'show'"
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:280
#| msgid "--merged"
msgid "merge"
msgstr "--merged"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--get-regexp"
msgid "get-ref"
msgstr "--get-regexp"
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, fuzzy, priority:100
+#, fuzzy, priority:280
#| msgid "Take the commit message from the given file. Use '-' to read the message from the standard input."
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr "Nimm die Eintragungsbemerkung (commit message) der spezifizierten Datei. Mit '-' wird die Bemerkung von der Standard Eingabe gelesen."
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr "-C <Objekt>"
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr "--reuse-message=<Objekt>"
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr "-c <Objekt>"
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr "--reedit-message=<Objekt>"
#. type: Plain text
#: en/git-notes.txt:157
-#, fuzzy, priority:100
+#, fuzzy, priority:280
#| msgid "Like '-C', but with '-c' the editor is invoked, so that the user can further edit the commit message."
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr "횆hnlich wie '-C' allerdings wird mit '-c' der Editor aufgerufen, wodurch der Benutzer die Eintragungsbemerkung vor der Eintragung 체berarbeiten kann."
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--refresh"
msgid "--ref <ref>"
msgstr "--refresh"
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr "-s <Strategie>"
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -35115,7 +35115,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -35123,13 +35123,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -35138,175 +35138,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -45085,19 +45085,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr "git-restore - Dateien im Arbeitsbereich wiederherstellen"
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -45109,147 +45109,147 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr "Stellt spezifizierte Pfade im Arbeitsbereich mit Inhalt aus einer Wiederherstellungsquelle wieder her. Wenn ein Pfad 체berwacht wird, aber in der Wiederherstellungsquelle nicht vorhanden ist, wird er entfernt, damit er mit der Quelle 체bereinstimmt."
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr "Der Befehl kann auch verwendet werden, um den Inhalt im Index mit `--staged` wiederherzustellen oder um sowohl den Arbeitsbereich (working tree) als auch den Index mit `--staged --worktree` wiederherzustellen."
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr "DIESER BEFEHL IST EXPERIMENTELL. M횜GLICHERWEISE KANN SICH DAS VERHALTEN 횆NDERN."
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr "-s <Tree>"
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr "--source=<Tree>"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr "Wiederherstellen der Dateien des Arbeitsbereichs mit dem Inhalt aus dem angegebenen Daten-Baum. Es ist 체blich, den Quellbaum durch Angabe eines assoziierten Commit-, Branch- oder Tag-Namens zu bestimmen."
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr "W채hlt interaktiv abweichende Abschnitte in der Wiederherstellungsquelle und dem Wiederherstellungsort aus. Siehe den Abschnitt \"Interaktiver Modus\" in linkgit:git-add[1], um zu erfahren, wie der `--patch`-Modus anzuwenden ist."
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "-n"
msgid "-S"
msgstr "-S"
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr "Bestimmt den Wiederherstellungsort. Wenn keine der beiden Optionen angegeben wurde, stellt das System standardm채횩ig den Arbeitsbereich wieder her. Mit der Angabe von `--staged` wird nur den Index wieder hergestellt. Die Angabe beider Optionen stellt beides wieder her."
#. type: Plain text
#: en/git-restore.txt:69
-#, fuzzy, priority:100
+#, fuzzy, priority:280
#| msgid "Quiet, suppress feedback messages."
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr "Leise, unterdr체cke Hinweisnachrichten."
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr "Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, verwendet man Stufe #2 ('ours') oder #3 ('theirs') f체r nicht gemergte Pfade."
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr "Hinweis: W채hrend eines `git rebase` und eines `git pull --rebase` k철nnen 'ours' und 'theirs' vertauscht erscheinen. Siehe die Beschreibung der gleichen Optionen in linkgit:git-checkout[1] f체r weitere Details."
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr "Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, muss der konfliktbehaftete Merge in den nicht zusammengef체hrten Pfaden neu erstellt werden."
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr "Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, sollte diese Operation nicht abgebrochen werden, wenn es nicht gemergte Eintr채ge gibt und weder `--ours`, `--theirs`, `--merge` noch `--conflict` angegeben ist. Nicht verschmolzene Pfade auf dem Arbeitsbereich werden ignoriert."
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr "Im Sparse-Checkout-Modus werden standardm채횩ig nur Eintr채ge aktualisiert, die mit `<pathspec>` und einzelnen Pattern in $GIT_DIR/info/sparse-checkout 체bereinstimmen. Diese Option ignoriert die einzelnen Pattern und stellt alle Dateien in `<pathspec>` vorbehaltlos wieder her."
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr "Im Overlay-Modus werden mit diesem Befehl niemals Dateien beim Wiederherstellen entfernt. Im No-Overlay-Modus werden getrackte Dateien, die nicht im `--source`-Tree vorkommen, entfernt, damit sie genau mit `<Tree>` 체bereinstimmen. Die Standardeinstellung ist der No-Overlay-Modus."
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr "Das folgende Listing wechselt in den Branch `master`, setzt das `Makefile` um zwei Revisionsst채nde zur체ck, dann wird hello.c irrt체mlich gel철scht, um danach wieder aus dem Index zur체ckgeholt zu werden."
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -45263,91 +45263,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr "Wiederherstellen von hello.c aus dem Index"
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr "Falls _alle_ C-Quelldateien wieder hergestellt werden sollen, damit sie mit der Version im Index 체bereinstimmen, kann man folgendes eingeben"
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr "Beachten Sie die Anf체hrungszeichen bei `*.c`. Die Datei `hello.c` wird auch wieder hergestellt, obwohl sie sich nicht mehr im Arbeitsbereich befindet, weil das Wildcard-Zeichen (*) verwendet wird, um damit Eintr채ge im Index (nicht im Arbeitsbereich der Shell) zu finden."
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr "So kann man alle Dateien im aktuellen Verzeichnis wieder herstellen"
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr "Eine Datei im Index so wiederherstellen, dass sie mit der Version in `HEAD` 체bereinstimmt (das entspricht dem Vorgehen wie mit linkgit:git-reset[1])"
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr "oder sowohl Index als auch den Arbeitsbereich zur체ckerhalten (das ist das gleiche wie mit linkgit:git-checkout[1])"
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr "$ git restore --source=HEAD --staged --worktree hello.c\n"
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr "die Kurzform ist praktischer aber nicht so gut lesbar:"
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -49055,139 +49055,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<Optionen>] [<Objekt>...]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr "Der Befehl verwendet Optionen, die auf den Befehl 'git diff-tree' anwendbar sind, um die Darstellung der durch den Commit eingebrachten 횆nderungen zu kontrollieren."
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr "<Objekt>..."
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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 "Die Namen der Objekte, die gezeigt werden sollen (Standardeinstellung 'HEAD'). Eine genauere Liste der m철glichen Schreibweisen von Objektnamen finden Sie im Abschnitt �얬EVISIONEN SPEZIFIZIEREN�� in linkgit:gitrevisions[7]."
#. type: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -60221,21 +60221,21 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "-L <start>,<end>"
msgid "-L<start>,<end>:<file>"
msgstr "-L <Anfang>,<Ende>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "-L :<funcname>"
msgid "-L:<funcname>:<file>"
msgstr "-L : <Funktionsname>"
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60692,212 +60692,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -62357,13 +62357,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62982,51 +62982,51 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, fuzzy, priority:100
+#, fuzzy, priority:260
#| msgid "support the following date formats:"
msgid "Thus, the following command:"
msgstr "unterst체tzen die folgenden Datumsformate:"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "$ git restore .\n"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "$ git restore .\n"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -63034,7 +63034,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid ""
#| "$ git reflog -2 HEAD # or\n"
#| "$ git log -g -2 HEAD\n"
@@ -63047,13 +63047,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -63061,7 +63061,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64931,19 +64931,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.es.po b/po/documentation.es.po
index fc1c029..75bc0fb 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -3558,55 +3558,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3623,43 +3623,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3671,25 +3671,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3702,7 +3702,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3717,7 +3717,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3732,37 +3732,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3772,85 +3772,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6008,7 +6008,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6020,7 +6020,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6996,7 +6996,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7068,7 +7068,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7346,7 +7346,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8165,7 +8165,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9672,19 +9672,19 @@ msgstr "Ver linkgit:git-add[1]."
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9705,181 +9705,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "La ordenaci처n y el filtrado de ramas no distinguen entre may첬sculas y min첬sculas."
@@ -9897,313 +9897,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<nueva-rama>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10213,19 +10213,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10235,25 +10235,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10261,67 +10261,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr "NOTAS"
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11411,7 +11411,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12272,13 +12272,13 @@ msgstr "Silencioso. Suprime los mensajes de respuesta."
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12296,13 +12296,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12452,7 +12452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12494,13 +12494,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12554,7 +12554,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12566,13 +12566,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12632,7 +12632,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12881,7 +12881,7 @@ msgstr "Cambiar de rama"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13410,7 +13410,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15910,7 +15910,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16318,7 +16318,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31428,7 +31428,7 @@ msgstr "Ver linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34217,19 +34217,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34247,391 +34247,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34641,7 +34641,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34649,13 +34649,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34664,175 +34664,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44538,19 +44538,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44559,145 +44559,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44707,91 +44707,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48489,139 +48489,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<opciones>] [<objeto>...]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59554,20 +59554,20 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "-L <start>,<end>"
msgid "-L<start>,<end>:<file>"
msgstr "-L <inicio>,<fin>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60023,209 +60023,209 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "nvimdiff"
msgid "nvimdiff1"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61680,13 +61680,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62305,50 +62305,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62356,7 +62356,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62364,13 +62364,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62378,7 +62378,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64248,19 +64248,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index b121a9a..ceaadcc 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -3554,55 +3554,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3619,43 +3619,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3667,25 +3667,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3698,7 +3698,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3713,7 +3713,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3728,37 +3728,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3768,85 +3768,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6003,7 +6003,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6015,7 +6015,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6986,7 +6986,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7058,7 +7058,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7336,7 +7336,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8155,7 +8155,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9661,19 +9661,19 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9694,181 +9694,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, fuzzy, priority:240
+#, fuzzy, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "ordenamiento y filtrado son case-insensitive"
@@ -9886,313 +9886,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, fuzzy, priority:240
+#, fuzzy, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr "listar혻ramas de remote-tracking y locales"
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "<newbranch>"
msgstr "[nueva rama]"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10202,19 +10202,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10224,25 +10224,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10250,67 +10250,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11403,7 +11403,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12264,13 +12264,13 @@ msgstr "suprimir mensajes de feedback"
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12288,13 +12288,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12444,7 +12444,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12486,13 +12486,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12546,7 +12546,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12558,13 +12558,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12624,7 +12624,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12874,7 +12874,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13403,7 +13403,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15894,7 +15894,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16302,7 +16302,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31407,7 +31407,7 @@ msgstr "linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34196,19 +34196,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34226,391 +34226,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:280
msgid "merge"
msgstr "emerge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34620,7 +34620,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34628,13 +34628,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34643,175 +34643,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44518,19 +44518,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:280
msgid "git-restore - Restore working tree files"
msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo"
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44539,146 +44539,146 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "-s <tree>"
msgstr "찼rbol-ismo"
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--source"
msgid "--source=<tree>"
msgstr "--source"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, fuzzy, priority:100
+#, fuzzy, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr "suprimir mensajes de feedback"
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44688,91 +44688,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48467,139 +48467,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "git show [<opciones>] <objeto>..."
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59539,19 +59539,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60007,212 +60007,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61682,13 +61682,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62307,50 +62307,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62358,7 +62358,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62366,13 +62366,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62380,7 +62380,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64250,19 +64250,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index ef53b04..c4ee0e6 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -3,7 +3,19 @@
# This file is distributed under the same license as the Git package.
# Jean-No챘l Avila <jn.avila@free.fr>, 2019.
msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-03-21 17:29+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.5.2-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-02-27 18:16+0100\n"
+"PO-Revision-Date: 2021-03-21 17:29+0000\n"
+"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.5.2-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:738 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
@@ -3593,55 +3605,55 @@ msgstr "Le caract챔re `NUL` suppl챕mentaire avant le chemin de pr챕image dans le
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr "G챕n챕ration du texte de rustine avec -p"
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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])."
#. type: Plain text
#: en/diff-generate-patch.txt:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr "L'option produit quelque chose l챕g챔rement diff챕rent du format diff traditionnel혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr "Il est pr챕c챕d챕 d'un ent챗te \"git diff\" qui ressemble 횪 ceci혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/fichier1 b/fichier2\n"
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr "les noms de fichiers sous `a/` et `b/` sont identiques 횪 moins qu'il y ait eu un renommage ou une copie, m챗me pour un cr챕ation ou une suppression, `/dev/null` _n'est pas_ utilis챕 횪 la place des noms de fichier `a/` ou`b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:30
-#, priority:260
+#, priority:280
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr "Quand un renommage ou un copie est d챕crit, `fichier1` et `fichier2` indiquent les noms du fichier source et du fichier cible, respectivement."
#. type: Plain text
#: en/diff-generate-patch.txt:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr "Suivent un ligne ou plus d'ent챗te 챕tendu혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3669,43 +3681,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr "Les modes de fichier sont affich챕s comme des nombres 횪 6 chiffres en octal incluant le type de fichier et les bits de permission."
#. type: Plain text
#: en/diff-generate-patch.txt:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr "Les noms de chemin dans les ent챗tes 챕tendus n'incluent pas les pr챕fixes `a/` et `b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr "L'index de similarit챕 et le pourcentage de lignes inchang챕es et l'index de dissimilarit챕 est le pourcentage de lignes chang챕es. Il est arrondi 횪 l'entier inf챕rieur, suivi du signe pourcent. Une valeur d'index de similarit챕 횪 100혻% correspond donc 횪 deux fichiers identiques, tandis qu'un index de dissimilarit챕 de 100혻% signifie qu'aucune ligne de l'ancien fichier ne se retrouve dans le nouveau fichier."
#. type: Plain text
#: en/diff-generate-patch.txt:60
-#, priority:260
+#, priority:280
msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr "La ligne d'index inclut les noms des objets blob avant et apr챔s la modification. Le <mode> est inclus si le mode du fichier n'est pas modifi챕혻; sinon, des lignes s챕par챕es indiquent l'ancien et le nouveau mode."
#. type: Plain text
#: en/diff-generate-patch.txt:64
-#, priority:260
+#, priority:280
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr "Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:69
-#, priority:260
+#, priority:280
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr "Tous les fichiers `fichier1` de la sortie font r챕f챕rence 횪 des fichiers avant la validation, et tous les fichiers `fichier2` font r챕f챕rence aux fichiers apr챔s la validation. Il est incorrect d'appliquer chaque modification 횪 chaque fichier s챕quentiellement. Par exemple, cette rustine 챕change a et b혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3723,25 +3735,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr "Format de diff combin챕"
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr "Toute commande g챕n챕rant un diff accepte l'option `-c` ou `-cc` pour produire un 'diff combin챕' lors de l'affichage d'une fusion. C'est le format par d챕faut pour afficher les fusions avec linkgit:git-diff[1] ou linkgit:git-show[1]. Notez aussi que vous pouvez ajouter l'option adapt챕e `--diff-merges` 횪 toutes ces commandes pour forcer la g챕n챕ration des diffs dans un format sp챕cifique."
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr "Un format de 'diff combin챕' ressemble 횪 ceci혻:"
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3761,7 +3773,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3785,7 +3797,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3809,37 +3821,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr "Il est pr챕c챕d챕 d'un ent챗te \"git diff\", qui ressemble 횪 ceci (quand l'option `-c` est utilis챕e)혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr "diff --combined file\n"
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr "ou 횪 ceci (lorsque l'option `--cc` est utilis챕e)혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr " diff --cc file\n"
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr "Il est suivi par une ligne d'ent챗te 챕tendu ou plus (cet exemple montre une fusion avec deux parents)혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3853,85 +3865,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr "La ligne `mode <mode>,<mode>..<mode>` n'appara챤t que si au moins un des modes est diff챕rent du reste. Les ent챗tes 챕tendus avec l'information 횪 propos des d챕placements d챕tect챕s de contenu (d챕tection de renommages et de copies) sont con챌us pour fonctionner avec le diff de deux <arbre-esques> et ne sont pas utilis챕s dans le format de diff combin챕."
#. type: Plain text
#: en/diff-generate-patch.txt:144
-#, priority:260
+#, priority:280
msgid "It is followed by two-line from-file/to-file header"
msgstr "Il est suivi par un ent챗te de deux lignes fichier-source/fichier-cible"
#. type: Plain text
#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr "a/fichier"
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr "b/fichier"
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr "Similaire 횪 l'ent챗te 횪 deux lignes pour le format diff unifi챕 traditionnel, `/dev/null` est utilis챕 pour indiquer un fichier cr챕챕 ou supprim챕."
#. type: Plain text
#: en/diff-generate-patch.txt:155
-#, priority:260
+#, priority:280
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr "Cependant, si l'option --combined-all-paths est fournie, au lieu des deux lignes de fichier-source/fichier-cible, vous obtenez un en-t챗te de N+1 lignes de fichier-source/fichier-cible, o첫 N est le nombre de parents dans le commit de fusion"
#. type: Plain text
#: en/diff-generate-patch.txt:164
-#, priority:260
+#, priority:280
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr "Ce format 챕tendu peut 챗tre utile si la d챕tection de renommage ou de copie est active, pour vous permettre de voir le nom original du fichier dans diff챕rents parents."
#. type: Plain text
#: en/diff-generate-patch.txt:170
-#, priority:260
+#, priority:280
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr "Le format d'ent챗te de section est modifi챕 pour emp챗cher l'utilisation accidentelle avec `patch -p1`. Le format de diff combin챕 a 챕t챕 cr챕챕 pour les revues des modifications de commits de fusions, et n'챕tait pas destin챕 횪 챗tre appliqu챕. La modification est similaire 횪 la modification dans l'ent챗te 챕tendu d'index혻:"
#. type: Plain text
#: en/diff-generate-patch.txt:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <intervalle-de-fichier-source> <intervalle-de-fichier-source> <intervalle-de-fichier-cible> @@@\n"
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr "Il y a (nombre de parents + 1) caract챔res `@` dans l'ent챗te de section pour le format de diff combin챕."
#. type: Plain text
#: en/diff-generate-patch.txt:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr "� la diff챕rence du format diff 'unifi챕' traditionnel qui montre deux fichiers A et B avec une seule colonne qui a un pr챕fixe `-` (moins -- appara챤t dans A mais supprim챕 dans B), `+` (plus -- manquant dans A mais ajout챕 dans B), ou `\" \"` (espace -- non modifi챕), ce format compare un fichier ou plus fichier1, fichier2,�� avec un fichier X, et affiche comment X diff챔re de chaque fichierN. Une colonne pour chaque fichierN est ins챕r챕e dans la sortie pour montrer comment la ligne de X est diff챕rente de la ligne correspondante de celui-ci."
#. type: Plain text
#: en/diff-generate-patch.txt:190
-#, priority:260
+#, priority:280
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr "Un caract챔re `-` dans la colonne N signifie que la ligne appara챤t dans fichierN mais pas dans le r챕sultat. Un caract챔re `+` dans la colonne N signifie que la ligne appara챤t dans le r챕sultat, et fichierN ne l'a pas (en d'autres termes, la ligne a 챕t챕 ajout챕e du point de vue de ce parent)."
#. type: Plain text
#: en/diff-generate-patch.txt:196
-#, priority:260
+#, priority:280
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr "Dans l'exemple de sortie ci-dessus, la signature de la fonction a 챕t챕 chang챕e depuis les deux fichiers (d'o첫 les deux suppressions `-` depuis fichier1 et fichier2, plus `++` pour signifier qu'une ligne qui a 챕t챕 ajout챕e n'appara챤t ni dans fichier1 ni dans fichier2). De plus, huit autres lignes sont identiques depuis fichier1 mais n'apparaissent pas dans fichier2 (et sont donc pr챕fix챕es par `+`)."
#. type: Plain text
#: en/diff-generate-patch.txt:202
-#, priority:260
+#, priority:280
msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr "Quand affich챕 par `git diff-tree -c`, les parents du commit de fusion sont compar챕s avec le r챕sultat de fusion (c-횪-d fichier1..fichierN sont les parents)혻; Quand affich챕 par `git diff-files -c`, les deux parents de fusion non r챕solue sont compar챕s avec le fichier dans l'arbre de travail (c-횪-d fichier1 est stage 2, 짬혻notre version혻쨩, fichier2 est stage 3, 짬혻leur version혻쨩)."
@@ -6101,7 +6113,7 @@ msgstr "G챕n챕ralement, les recherches r챕cursives parall챔les et sur des distan
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6113,7 +6125,7 @@ msgstr "D챕sactiver la r챕cup챕ration r챕cursive des sous-modules (cela a le m챗
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -7111,7 +7123,7 @@ msgstr "La liste de fichiers de bo챤te aux lettres desquelles on lit les rustine
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7183,7 +7195,7 @@ msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7463,7 +7475,7 @@ msgstr "En cas de d챕faillance d'un patch, <msg> sera imprim챕 횪 l'챕cran avant
#. 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8295,7 +8307,7 @@ msgstr "Format de l'archive r챕sultante : 'tar' ou 'zip'. Si cette option n'est
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9130,7 +9142,10 @@ msgid ""
"$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\n"
" # v2.6.20-rc6 is bad\n"
" # v2.6.20-rc4 and v2.6.20-rc1 are good\n"
-msgstr "$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\n # v2.6.20-rc6 est mauvaise\n # v2.6.20-rc4 and v2.6.20-rc1 sont bonnes\n"
+msgstr ""
+"$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\n"
+" # v2.6.20-rc6 est mauvaise\n"
+" # v2.6.20-rc4 and v2.6.20-rc1 sont bonnes\n"
#. type: Title ~
#: en/git-bisect.txt:314
@@ -9235,7 +9250,10 @@ msgid ""
"$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good\n"
"$ git bisect run make # \"make\" builds the app\n"
"$ git bisect reset # quit the bisect session\n"
-msgstr "$ git bisect start HEAD v1.2 -- # HEAD est mauvaise, v1.2 is bonne\n$ git bisect run make # \"make\" construit l'application\n$ git bisect reset # quitter la session bisect\n"
+msgstr ""
+"$ git bisect start HEAD v1.2 -- # HEAD est mauvaise, v1.2 is bonne\n"
+"$ git bisect run make # \"make\" construit l'application\n"
+"$ git bisect reset # quitter la session bisect\n"
#. type: Plain text
#: en/git-bisect.txt:391
@@ -9250,7 +9268,10 @@ msgid ""
"$ git bisect start HEAD origin -- # HEAD is bad, origin is good\n"
"$ git bisect run make test # \"make test\" builds and tests\n"
"$ git bisect reset # quit the bisect session\n"
-msgstr "$ git bisect start HEAD origin -- # HEAD est mauvaise, origin est bonne\n$ git bisect run make test # \"make test\" construit et teste\n$ git bisect reset # quitter la session bisect\n"
+msgstr ""
+"$ git bisect start HEAD origin -- # HEAD est mauvaise, origin est bonne\n"
+"$ git bisect run make test # \"make test\" construit et teste\n"
+"$ git bisect reset # quitter la session bisect\n"
#. type: Plain text
#: en/git-bisect.txt:399 en/git-bisect.txt:453
@@ -9269,7 +9290,14 @@ msgid ""
"$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n"
"$ git bisect run ~/test.sh\n"
"$ git bisect reset # quit the bisect session\n"
-msgstr "$ cat ~/test.sh\n#!/bin/sh\nmake || exit 125 # ceci saute la construction cass챕e\n~/check_test_case.sh # est-ce que le test passe혻?\n$ git bisect start HEAD HEAD~10 -- # le coupable est parmi les 10 derniers\n$ git bisect run ~/test.sh\n$ git bisect reset # quitter la session bisect\n"
+msgstr ""
+"$ cat ~/test.sh\n"
+"#!/bin/sh\n"
+"make || exit 125 # ceci saute la construction cass챕e\n"
+"~/check_test_case.sh # est-ce que le test passe혻?\n"
+"$ git bisect start HEAD HEAD~10 -- # le coupable est parmi les 10 derniers\n"
+"$ git bisect run ~/test.sh\n"
+"$ git bisect reset # quitter la session bisect\n"
#. type: Plain text
#: en/git-bisect.txt:414
@@ -9295,7 +9323,9 @@ msgstr "Bisection automatique avec modifications temporaires (hot-fix) :"
msgid ""
"$ cat ~/test.sh\n"
"#!/bin/sh\n"
-msgstr "$ cat ~/test.sh\n#!/bin/sh\n"
+msgstr ""
+"$ cat ~/test.sh\n"
+"#!/bin/sh\n"
#. type: delimited block -
#: en/git-bisect.txt:437
@@ -9313,7 +9343,19 @@ msgid ""
"\t# tell the caller this is untestable\n"
"\tstatus=125\n"
"fi\n"
-msgstr "# bricole l'arbre de travail en fusionnant une branche hot-fix\n# puis tente de construire\nif\tgit merge --no-commit --no-ff hot-fix &&\n\tmake\nthen\n\t# lance le test sp챕cifique au projet et rapporter son 챕tat\n\t~/check_test_case.sh\n\tstatus=$?\nelse\n\t# indique 횪 l'appelant que ce n'est pas testable\n\tstatus=125\nfi\n"
+msgstr ""
+"# bricole l'arbre de travail en fusionnant une branche hot-fix\n"
+"# puis tente de construire\n"
+"if\tgit merge --no-commit --no-ff hot-fix &&\n"
+"\tmake\n"
+"then\n"
+"\t# lance le test sp챕cifique au projet et rapporter son 챕tat\n"
+"\t~/check_test_case.sh\n"
+"\tstatus=$?\n"
+"else\n"
+"\t# indique 횪 l'appelant que ce n'est pas testable\n"
+"\tstatus=125\n"
+"fi\n"
#. type: delimited block -
#: en/git-bisect.txt:440
@@ -9321,7 +9363,9 @@ msgstr "# bricole l'arbre de travail en fusionnant une branche hot-fix\n# puis t
msgid ""
"# undo the tweak to allow clean flipping to the next commit\n"
"git reset --hard\n"
-msgstr "# d챕fait le bricolage pour permettre de basculer proprement sur le prochain commit\ngit reset --hard\n"
+msgstr ""
+"# d챕fait le bricolage pour permettre de basculer proprement sur le prochain commit\n"
+"git reset --hard\n"
#. type: delimited block -
#: en/git-bisect.txt:443
@@ -9329,7 +9373,9 @@ msgstr "# d챕fait le bricolage pour permettre de basculer proprement sur le proc
msgid ""
"# return control\n"
"exit $status\n"
-msgstr "# redonne le contr척le\nexit $status\n"
+msgstr ""
+"# redonne le contr척le\n"
+"exit $status\n"
#. type: Plain text
#: en/git-bisect.txt:451
@@ -9344,7 +9390,10 @@ msgid ""
"$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n"
"$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n"
"$ git bisect reset # quit the bisect session\n"
-msgstr "$ git bisect start HEAD HEAD~10 -- # le coupable est parmi les dix derniers\n$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n$ git bisect reset # quitter la session bisect\n"
+msgstr ""
+"$ git bisect start HEAD HEAD~10 -- # le coupable est parmi les dix derniers\n"
+"$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n"
+"$ git bisect reset # quitter la session bisect\n"
#. type: Plain text
#: en/git-bisect.txt:462
@@ -9370,7 +9419,15 @@ msgid ""
"\trc=$?\n"
"\trm -f tmp.$$\n"
"\ttest $rc = 0'\n"
-msgstr "$ git bisect start HEAD <bon-commit-connu> [ <commit-fronti챔re> ... ] --no-checkout\n$ git bisect run sh -c '\n\tGOOD=$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&\n\tgit rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&\n\tgit pack-objects --stdout >/dev/null <tmp.$$\n\trc=$?\n\trm -f tmp.$$\n\ttest $rc = 0'\n"
+msgstr ""
+"$ git bisect start HEAD <bon-commit-connu> [ <commit-fronti챔re> ... ] --no-checkout\n"
+"$ git bisect run sh -c '\n"
+"\tGOOD=$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&\n"
+"\tgit rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&\n"
+"\tgit pack-objects --stdout >/dev/null <tmp.$$\n"
+"\trc=$?\n"
+"\trm -f tmp.$$\n"
+"\ttest $rc = 0'\n"
#. type: delimited block -
#: en/git-bisect.txt:476
@@ -9397,7 +9454,10 @@ msgid ""
"$ git bisect start\n"
"$ git bisect new HEAD # current commit is marked as new\n"
"$ git bisect old HEAD~10 # the tenth commit from now is marked as old\n"
-msgstr "$ git bisect start\n$ git bisect new HEAD # le commit est maqu챕 comme nouveau\n$ git bisect old HEAD~10 # le dixi챔me commit en amont est marqu챕 comme vieux\n"
+msgstr ""
+"$ git bisect start\n"
+"$ git bisect new HEAD # le commit est maqu챕 comme nouveau\n"
+"$ git bisect old HEAD~10 # le dixi챔me commit en amont est marqu챕 comme vieux\n"
#. type: Plain text
#: en/git-bisect.txt:491
@@ -9412,7 +9472,10 @@ msgid ""
"$ git bisect start --term-old broken --term-new fixed\n"
"$ git bisect fixed\n"
"$ git bisect broken HEAD~10\n"
-msgstr "$ git bisect start --term-old broken --term-new fixed\n$ git bisect fixed\n$ git bisect broken HEAD~10\n"
+msgstr ""
+"$ git bisect start --term-old broken --term-new fixed\n"
+"$ git bisect fixed\n"
+"$ git bisect broken HEAD~10\n"
#. type: Title ~
#: en/git-bisect.txt:498
@@ -9822,19 +9885,19 @@ msgstr "Voir linkgit:gitmailmap[5]."
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr "git-branch - Liste, cr챕e, ou supprime des branches"
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9870,181 +9933,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr "Si `--list` est donn챕, ou s'il n'y a pas d'arguments sans option, les branches existantes sont list챕es ; la branche actuelle sera surlign챕e en vert et marqu챕e d'un ast챕risque. Toutes les branches extraites dans les arbres de travail li챕s seront mis en 챕vidence en cyan et marqu챕s d'un signe plus. L'option `-r` ajoute la liste des branches de suivi 횪 distance et l'option` -a` affiche les branches locales et distantes."
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr "Si un `<motif>` est donn챕, il est utilis챕 comme joker du shell pour restreindre la sortie aux branches correspondantes. Si plusieurs motifs sont donn챕s, une branche est affich챕e si elle correspond 횪 l'un des motifs."
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr "Notez que lorsque vous fournissez un `<motif> `, vous devez utiliser `--list` ; sinon, la commande peut 챗tre interpr챕t챕e comme une cr챕ation de branche."
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr "Avec `--contains`, montrer seulement les branches qui contiennent le commit indiqu챕 (en d'autres termes, les branches dont les commits sommets sont des descendants du commit indiqu챕), avec `--no-contains` inverser. Avec `--merged`, seules les branches fusionn챕es dans le commit indiqu챕 (c'est-횪-dire les branches dont les commits sommets sont accessibles depuis le commit indiqu챕) seront list챕es. Avec `--no-merged`, seules les branches non fusionn챕es dans le commit indiqu챕 seront list챕es. Si l'argument <commit> est manquant, il prend par d챕faut la valeur \"HEAD\" (c'est-횪-dire le sommet de la branche courante)."
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr "La deuxi챔me forme de la commande cr챕e une nouvelle t챗te de branche nomm챕e <nom-de-branche> qui pointe vers la `HEAD` actuelle, ou <point-de-d챕part> si elle est fournie. Dans un cas particulier, pour le <point-de-d챕part>, vous pouvez utiliser `\"A...B\"` comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une base de fusion. Vous pouvez omettre tout au plus un des `A` et `B`, auquel cas il s'agit par d챕faut de `HEAD`."
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr "Notez que cela cr챕era la nouvelle branche, mais ne fera pas passer l'arbre de travail sur celle-ci ; utilisez \"git switch <nouvelle-branche>\" pour passer sur la nouvelle branche."
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr "Lorsqu'une branche locale est d챕marr챕e 횪 partir d'une branche de suivi 횪 distance, Git configure la branche (plus pr챕cis챕ment les entr챕es de configuration `branch.<nom>.remote` et `branch.<nom>.merge`) de fa챌on 횪 ce que 'git pull' fusionne correctement avec la branche de suivi 횪 distance. Ce comportement peut 챗tre modifi챕 via le drapeau de configuration global `branch.autoSetupMerge`. Ce param챔tre peut 챗tre modifi챕 en utilisant les options `---track` et `--no-track`, et chang챕 plus tard en utilisant `git branch --set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr "Avec une option `-m` ou `-M`, <ancienne-branche> sera renomm챕e en <nouvelle-branche>. Si <ancienne-branche> avait un reflog correspondant, il est renomm챕 pour correspondre 횪 <nouvelle-branche>, et une entr챕e de reflog est cr챕챕e pour se souvenir du renommage de la branche. Si <nouvelle-branche> existe d챕j횪, -M doit 챗tre utilis챕 pour forcer le changement de nom."
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr "Les options `-c` et `-C` ont exactement la m챗me s챕mantique que `-m` et `-M`, sauf qu'au lieu de renommer la branche,elle sera copi챕e sous un nouveau nom avec sa configuration et son reflog."
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr "Avec une option `-d` ou `-D`, `<branchname>` sera supprim챕. Vous pouvez sp챕cifier plus d'une branche pour la suppression. Si la branche a actuellement un reflog, alors le reflog sera aussi supprim챕."
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr "Utilisez `-r` avec `-d` pour supprimer les branches de suivi 횪 distance. Notez qu'il est logique de supprimer les branches de suivi 횪 distance uniquement si elles n'existent plus dans le d챕p척t distant ou si \"git fetch\" a 챕t챕 configur챕 pour ne pas les r챕cup챕rer 횪 nouveau. Voir aussi la sous-commande 짬 prune 쨩 de linkgit:git-remote[1] pour une m챕thode de nettoyage toutes les branches obsol챔tes de suivi 횪 distance."
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr "Supprimer une branche. La branche doit 챗tre enti챔rement fusionn챕e dans sa branche amont, ou dans `HEAD` si aucune branche amont n'a 챕t챕 fix챕e avec `--track` ou `--set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr "Raccourci pour `--delete --force`."
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr "Cr챕er le reflog de la branche. Cela active l'enregistrement de toutes les modifications apport챕es 횪 la branche ref, permettant l'utilisation d'expressions sha1 bas챕es sur la date telles que \"<nom-de-branche>@\\{yesterday}\". Notez que dans les d챕p척ts non-nus, les reflogs sont g챕n챕ralement activ챕s par d챕faut par l'option de configuration `core.logAllRefUpdates`. La forme n챕gative `--no-create-reflog` ne fait que remplacer un `--create-reflog` pr챕c챕dent, mais n'annule pas actuellement le param챔tre `core.logAllRefUpdates`."
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr "R챕initialiser <branche> 횪 <point de d챕part>, m챗me si <branche> existe d챕j횪. Sans `-f`, \"git branch\" refuse de changer une branche existante. En combinaison avec `-d` (ou `--delete`), permettre la suppression de la branche ind챕pendamment de son statut de fusion. En combinaison avec `-m` (ou `--move`), il est possible de renommer la branche m챗me si le nouveau nom de la branche existe d챕j횪, il en va de m챗me pour `-c` (ou `--copy`)."
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr "D챕placer/renommer une branche et le reflog correspondant."
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr "-M"
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr "Raccourci pour `--move-force`."
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
msgid "Copy a branch and the corresponding reflog."
msgstr "Copier une branche et le reflog correspondant."
#. type: Plain text
#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr "-C"
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr "Raccourci pour `--copy-force`."
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr "Colorier les branches pour mettre en 챕vidence les branches actuelles, locales et de suivi 횪 distance. La valeur doit 챗tre 짬 always 쨩 (c-횪-d toujours) (valeur par d챕faut), 짬 never 쨩 (c-횪-d jamais) ou 짬 auto 쨩."
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr "D챕sactiver les couleurs des branches, m챗me lorsque le fichier de configuration donne la sortie en couleur par d챕faut. M챗me chose que `--color=never`."
#. 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "Le tri et le filtrage de branches sont non-sensibles 횪 la casse."
@@ -10062,313 +10125,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr "Afficher la liste des branches en colonnes. Voir la variable de configuration `column.branch` pour la syntaxe des options.`-- column` et `--no-column` sans options 챕quivalent respectivement 횪 'always' et 'never'."
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr "Cette option ne s�셙pplique qu�셞n mode non verbeux."
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr "횋num챕rer ou supprimer (si utilis챕 avec -d) les branches de suivi 횪 distance. Combiner avec `-list` pour faire correspondre le(s) motif(s) optionnel(s)."
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr "Afficher 횪 la fois les branches de suivi et les branches locales. Combiner avec `--list` pour faire correspondre un ou des motifs optionnels."
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr "Listes les branches. Avec l'option `<pattern>...`, par exemple `git branch --list 'maint-*'`, ne lister que les branches qui correspondent au(x) motif(s)."
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr "Afficher le nom de la branche actuelle. En 챕tat de HEAD d챕tach챕e, rien n'est affich챕."
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr "En mode liste, afficher le sha1 et valider le sujet pour chaque t챗te, ainsi que la relation avec la branche amont (le cas 챕ch챕ant). S'il est donn챕 deux fois, imprimer le chemin de l'arbre de travail li챕 (le cas 챕ch챕ant) ainsi que le nom de la branche amont (voir aussi `git remote show <remote>`). Notez que la HEAD de l'arbre de travail actuel n'aura pas son chemin d'acc챔s affich챕 (il s'agira toujours de votre r챕pertoire actuel)."
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr "횎tre plus discret lors de la cr챕ation ou la destruction d'une branche, en supprimant les messages qui ne sont pas des erreurs."
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr "Dans la liste d챕taill챕e qui indique le nom de l'objet commit, indiquer le pr챕fixe le plus court d'au moins '<n>' chiffres hexad챕cimaux, qui renvoie de mani챔re unique 횪 l'objet. La valeur par d챕faut est 7 et peut 챗tre remplac챕e par l'option de configuration `core.abbrev`."
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr "Afficher les sha1s complets dans la liste des r챕sultats plut척t que de les abr챕ger."
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr "Lors de la cr챕ation d'une nouvelle branche, configurer les entr챕es de configuration `branch.<nom>.remote` et `branch.<nom>.merge` pour marquer la branche de d챕part comme 챕tant \"en amont\" de la nouvelle branche. Cette configuration indiquera 횪 git de montrer la relation entre les deux branches dans \"git status\" et \"git branch -v\". En outre, il r챔gle `git pull` sans arguments de tirer depuis l'amont lorsque la nouvelle branche est extraite."
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr "Ce comportement est le d챕faut lorsque le point de d챕part est une branche de suivi 횪 distance. D챕finissez la variable de configuration branch.autoSetupMerge 횪 `false` si vous voulez `git switch`, `git checkout` et `git branch` pour toujours se comporter comme si `--no-track` a 챕t챕 donn챕. R챕glez-le `always` si vous voulez ce comportement lorsque le point de d챕part est soit une branche locale ou de suivi 횪 distance."
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr "Ne pas renseigner la configuration 짬혻amont혻쨩, m챗me si la configuration branch.autoSetupMerge est true."
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr "Comme cette option avait une syntaxe confuse, elle n'est plus support챕e. Veuillez utiliser `--track` ou `--set-upstream-to` 횪 la place."
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr "-u <amont>"
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr "--set-upstream-to=<amont>"
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr "Configurer les informations de suivi de <nome-de-branche> pour que <amont> soit consid챕r챕 comme la branche amont de <nome-de-branche>. Si aucun <nom-de-branche> n'est sp챕cifi챕, alors la branche actuelle est utilis챕e par d챕faut."
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr "Supprimer les informations en amont pour <nom-de-branche>. Si aucune branche n'est sp챕cifi챕e, la branche actuelle est utilis챕e par d챕faut."
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr "Ouvrir un 챕diteur et 챕diter le texte pour expliquer 횪 quoi sert la branche, qui sera utilis챕e par diverses autres commandes (par exemple `format-patch`, `pull-request` et `merge` (si activ챕)). Des explications sur plusieurs lignes peuvent 챗tre utilis챕es."
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr "--contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "N'indiquer que les branches qui contiennent le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr "--no-contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "N'indiquer que les branches qui contiennent le commit sp챕cifi챕 (HEAD si non sp챕cifi챕). Implique `--list`."
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr "--merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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`."
#. type: Labeled list
#: en/git-branch.txt:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr "--no-merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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`."
#. type: Labeled list
#: en/git-branch.txt:263
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr "<nom-de-branche>"
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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 "Le nom de la branche 횪 cr챕er ou 횪 supprimer. Le nouveau nom de la branche doit passer tous les contr척les d챕finis par linkgit:git-check-ref-format[1]. Certains de ces contr척les peuvent restreindre les caract챔res autoris챕s dans un nom de branche."
#. type: Labeled list
#: en/git-branch.txt:269 en/git-switch.txt:42
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr "<point_de_d챕part>"
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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 "La nouvelle t챗te de branche pointera sur ce commit. Il peut 챗tre donn챕 sous la forme d'un nom de branche, d'un id de commit ou d'une 챕tiquette. Si cette option est omise, la HEAD actuelle sera utilis챕e 횪 la place."
#. type: Labeled list
#: en/git-branch.txt:274
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr "<anciennebranche>"
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr "Nom d'une branche existante 횪 renommer."
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<nouvelle_branche>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr "Le nouveau nom d'une branche existante. Les m챗mes restrictions que pour <nom-de-branche> s'appliquent."
#. 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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr "--sort=<cl챕>"
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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 "Trier en fonction de la cl챕 donn챕e. Pr챕fixer par `-` pour trier par ordre d챕croissant de la valeur. Vous pouvez utiliser l'option --sort=<cl챕> plusieurs fois, auquel cas la derni챔re cl챕 devient la cl챕 primaire. Les cl챕s support챕es sont les m챗mes que celles de `git for-each-ref`. L'ordre de tri est par d챕faut la valeur configur챕e pour la variable `branch.sort` si elle existe, ou le tri bas챕 sur le nom de r챕f챕rence complet (y compris le pr챕fixe `refs/...`). Cela liste d'abord les HEAD d챕tach챕es (si pr챕sentes), puis les branches locales et enfin les branches de suivi 횪 distance. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:293 en/git-tag.txt:158
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr "--points-at <objet>"
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr "N'indiquer que les branches de l'objet donn챕."
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr "--format <format>"
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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 "Une cha챤ne qui interpole `%(fieldame)` 횪 partir d�셵ne r챕f챕rence de branche montr챕e et l�셭bjet vers lequel elle pointe. Le format est le m챗me que celui de linkgit:git-for-each-ref[1]."
#. type: Plain text
#: en/git-branch.txt:306
-#, priority:240
+#, priority:260
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 "Le terme `pager.branch` n'est respect챕 que lorsqu'il s'agit d'챕num챕rer des branches, c'est-횪-dire lorsque `--list` est utilis챕 ou sous-entendu. La valeur par d챕faut est d'utiliser un pager. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:310
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr "D챕marrer le d챕veloppement 횪 partir d'une 챕tiquette connue"
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10382,19 +10445,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr "Cette 챕tape et la suivante pourraient 챗tre combin챕es en une seule 챕tape avec \"checkout -b my2.6.14 v2.6.14\"."
#. type: Labeled list
#: en/git-branch.txt:322
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr "Supprimer une branche inutile"
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10408,25 +10471,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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 "Supprimer les branches de suivi 횪 distance \"todo\", \"html\" et \"man\". La prochaine op챕ration de r챕cup챕ration ou de tirage les cr챕era 횪 nouveau, 횪 moins que vous ne les configuriez autrement. Voir linkgit:git-fetch[1]."
#. type: Plain text
#: en/git-branch.txt:336
-#, priority:240
+#, priority:260
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 "Supprimer la branche \"test\" m챗me si la branche \"master\" (ou n'importe quelle branche actuellement extraite) n'a pas tous les commits de la branche test."
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr "Lister les branches d'un distant sp챕cifique"
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10436,67 +10499,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr "L'utilisation de `-a` associerait <distant> avec toutes les branches locales dont le pr챕fixe est le m챗me que celui de <distant>."
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr "`for-each-ref` accepte un large 챕ventail d'options. Voir linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr "Les motifs devront normalement 챗tre cit챕s."
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr "NOTES"
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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 "Si vous cr챕ez une branche sur laquelle vous voulez passer imm챕diatement, il est plus facile d'utiliser la commande \"git switch\" avec son option `-c` pour faire la m챗me chose avec une seule commande."
#. type: Plain text
#: en/git-branch.txt:359
-#, priority:240
+#, priority:260
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr "Les options `--contains`, `--no-contains`, `--merged` et `--no-merged` servent quatre objectifs connexes mais diff챕rents :"
#. type: Plain text
#: en/git-branch.txt:363
-#, priority:240
+#, priority:260
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 "`--contains <commit>` est utilis챕 pour trouver toutes les branches qui devront faire l'objet d'une attention particuli챔re si <commit> devait 챗tre rebas챕 ou modifi챕, puisque ces branches contiennent le <commit> sp챕cifi챕."
#. type: Plain text
#: en/git-branch.txt:366
-#, priority:240
+#, priority:260
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr "`--no-contains <commit>` est l'inverse de cela, c'est-횪-dire les branches qui ne contiennent pas le <commit> sp챕cifi챕."
#. type: Plain text
#: en/git-branch.txt:369
-#, priority:240
+#, priority:260
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr "`--merged` est utilis챕 pour trouver toutes les branches qui peuvent 챗tre supprim챕es en toute s챕curit챕, puisque ces branches sont enti챔rement contenues par HEAD."
#. type: Plain text
#: en/git-branch.txt:372
-#, priority:240
+#, priority:260
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 "`--no-merged` est utilis챕 pour trouver les branches qui sont candidates 횪 la fusion avec HEAD, puisque ces branches ne sont pas enti챔rement contenues par HEAD."
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch [``Comprendre l'historique : Qu'est-ce qu'une branche ?''] dans le manuel d'utilisateur Git."
@@ -11585,7 +11648,7 @@ msgstr "Ne prendre en compte `.gitattributes` dans l'index seulement, en ignoran
#. 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12455,13 +12518,13 @@ msgstr "Silencieux, supprimer les messages d'챕tat."
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr "L'챕tat d'avancement est affich챕 sur la sortie standard d'erreur par d챕faut quand elle est attach챕e 횪 un terminal, 횪 moins que `--quiet` ne soit sp챕cifi챕. Cette bascule active l'챕tat d'avancement m챗me sans 챗tre attach챕 횪 un terminal, ind챕pendamment de `--quiet`."
@@ -12479,13 +12542,13 @@ msgstr "Lors de l'extraction de chemins depuis l'index, ne pas 챕chouer sur des
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12635,7 +12698,7 @@ msgstr "Si vous voulez d챕marrer un historique d챕connect챕 qui enregistre un en
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12677,13 +12740,13 @@ msgstr "Lors du basculement de branche avec '--merge', les modifications index챕
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr "--conflict=<style>"
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 "Identique 횪 l'option `--merge` ci-dessus, mais la mani챔re dont les sections en conflits sont pr챕sent챕es est modifi챕e, en surchargeant la variable de configuration `merge.conflictStyle`. Les valeurs possibles sont `merge` (fusion, par d챕faut) et `diff3` (en plus de ce qui est affich챕 avec le style `merge`, affiche aussi le contenu d'origine)."
@@ -12737,7 +12800,7 @@ msgstr "횋craser silencieusement les fichiers ignor챕s lors du basculement de br
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12749,13 +12812,13 @@ msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le cont
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12815,7 +12878,7 @@ msgstr "Le nom du commit auquel d챕marrer la nouvelle branche혻; voir linkgit:gi
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr "Autre cas sp챕cial suppl챕mentaire, vous pouvez utiliser 짬혻A...B혻쨩 comme raccourci pour la base de fusion de `A` et `B` s'il y a exactement une seule base de fusion. Vous pouvez ne pas sp챕cifier `A` ou `B`, auquel cas ce sera `HEAD` par d챕faut."
@@ -13121,7 +13184,7 @@ msgstr "bascule de branche"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr "prend un fichier depuis un autre commit"
@@ -13660,7 +13723,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr "--strategy=<strategie>"
@@ -14358,7 +14421,10 @@ msgid ""
"*NOTE*: this operation can race with concurrent modification to the\n"
"source repository, similar to running `cp -r src dst` while modifying\n"
"`src`.\n"
-msgstr "*NOTE*��: cette op챕ration peut se d챕rouler avec une modification simultan챕e du\nd챕p척t source, similaire 횪 l�셞x챕cution de `cp-r src dst` tout en modifiant\n`src`.\n"
+msgstr ""
+"*NOTE*��: cette op챕ration peut se d챕rouler avec une modification simultan챕e du\n"
+"d챕p척t source, similaire 횪 l�셞x챕cution de `cp-r src dst` tout en modifiant\n"
+"`src`.\n"
#. type: Labeled list
#: en/git-clone.txt:65
@@ -16215,7 +16281,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16623,7 +16689,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31785,7 +31851,7 @@ msgstr "Voir linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr "notes.displayRef"
@@ -34627,19 +34693,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34657,391 +34723,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr "Utiliser le message de note fourni (au lieu de le demander). Si plusieurs options `-m` sont fournies, leurs valeurs sont concat챕n챕es comme paragraphes s챕par챕s. Les lignes commen챌ant par `#` et les lignes vides sont supprim챕es si elles ne sont pas uniques entre paragraphes."
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr "Prendre le message de note depuis le fichier indiqu챕. Utilisez '-' pour lire le message depuis l'entr챕e standard. Les lignes commen챌ant par `#` et les lignes vides sont supprim챕es si elles ne sont pas uniques entre paragraphes."
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr "--reuse-message=<objet>"
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr "--reedit-message=<objet>"
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr "Comme '-C', mais avec '-c', l'챕diteur est appel챕 pour permettre 횪 l'utilisateur de modifier le message de note."
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr "-s <strat챕gie>"
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -35051,7 +35117,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -35059,13 +35125,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -35074,175 +35140,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -39409,7 +39475,10 @@ msgid ""
" 1 A\n"
"\t /\n"
" 2 --------' B\n"
-msgstr " 1 A\n\t /\n 2 --------' B\n"
+msgstr ""
+" 1 A\n"
+"\t /\n"
+" 2 --------' B\n"
#. type: Plain text
#: en/git-range-diff.txt:229
@@ -39427,7 +39496,13 @@ msgid ""
"\t |\n"
"\t `----- C\n"
"\t c>0\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+"\t |\n"
+"\t `----- C\n"
+"\t c>0\n"
#. type: Plain text
#: en/git-range-diff.txt:245
@@ -39446,7 +39521,14 @@ msgid ""
" o `----- C\n"
"\t c>0\n"
" o o\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+"\t |\n"
+" o `----- C\n"
+"\t c>0\n"
+" o o\n"
#. type: delimited block -
#: en/git-range-diff.txt:256
@@ -39477,7 +39559,14 @@ msgid ""
" o -' `----- C\n"
"\t c>0\n"
" o ---------- o\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+" .--+-----'\n"
+" o -' `----- C\n"
+"\t c>0\n"
+" o ---------- o\n"
#. type: delimited block -
#: en/git-range-diff.txt:284
@@ -45139,166 +45228,169 @@ msgstr "`X` signifie n'importe quel 챕tat et `U` signifie un index non fusionn챕
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr "git-restore - Restaure les fichier d'un arbre de travail"
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
"'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
-msgstr "'git restore' [<options>] [--source=<arbre>] [--staged] [--worktree] [--] <spec-de-chemin>...\n'git restore' [<options>] [--source=<arbre>] [--staged] [--worktree] --pathspec-from-file=<fichier> [--pathspec-file-nul]\n'git restore' (-p|--patch) [<options>] [--source=<arbre>] [--staged] [--worktree] [--] [<spec-de-chemin>...]\n"
+msgstr ""
+"'git restore' [<options>] [--source=<arbre>] [--staged] [--worktree] [--] <spec-de-chemin>...\n"
+"'git restore' [<options>] [--source=<arbre>] [--staged] [--worktree] --pathspec-from-file=<fichier> [--pathspec-file-nul]\n"
+"'git restore' (-p|--patch) [<options>] [--source=<arbre>] [--staged] [--worktree] [--] [<spec-de-chemin>...]\n"
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr "-s <arbre>"
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr "--source=<arbre>"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr "S챕lectionner interactivement les sections dans la diff챕rence entre la source de restauration et location de restauration. Voir la section 짬혻Mode Interactif혻쨩 de linkgit:git-add[1] pour apprendre 횪 utiliser le mode `--patch`."
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr "Silencieux, supprimer les messages d'챕tat. Implique `--no-progress`."
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr "Lors de la restauration de fichiers dans l'arbre de travail, utiliser l'챕tat #2 ('ours', le n척tre) ou #3 ('theirs', le leur) pour les chemins non fusionn챕s."
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr "Veuillez noter que pendant `git rebase` et `git pull --rebase`, `ours` et `theirs` peuvent sembler 챕chang챕s. Voir l'explication des m챗mes options dans linkgit:git-checkout[1] pour plus de d챕tails."
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr "Lors de la restauration de l'arbre de travail depuis l'index, r챕cr챕er la fusion en conflit dans les chemins non fusionn챕s."
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr "En mode d'extraction clairsem챕, le comportement par d챕faut met seulement 횪 jour les entr챕es correspondant 횪 `<sp챕cificateur-de-chemin>` et aux motifs clairsem챕s dans $GIT_DIR/info/sparse-checkout. Cette option ignore les motifs clairsem챕s et restaure tous les fichiers de `<sp챕cificateur-de-chemin>`."
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr "Si `<pathspec>` nomme un sous-module actif et que l'emplacement de la restauration inclut l'arbre de travail, le sous-module ne sera mis 횪 jour que si cette option est donn챕e, auquel cas son arbre de travail sera restaur챕 au commit enregistr챕 dans le superprojet, et toute modification locale sera 챕cras챕e. Si rien (ou `--no-recurse-submodules`) n'est utilis챕, les arbres de travail des sous-modules ne seront pas mis 횪 jour. Tout comme linkgit:git-checkout[1], cela d챕tachera le `HEAD` du sous-module."
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr "La s챕quence suivante bascule sur la branche `master`, ram챔ne le fichier `Makefile` 횪 deux r챕visions en arri챔re, supprime hello.c par erreur et le r챕cup챔re de l'index."
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -45312,91 +45404,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr "restaure hello.c depuis l'index"
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr "Si vous souhaitez restaurer _tous_ les fichiers source C pour correspondre 횪 la version de l'index, vous pouvez lancer"
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr "Notez les guillemets autour de `*.c`. Le fichier `hello.c` sera aussi restaur챕, m챗me s'il n'est plus dans l'arbre de travail, parce que le patron de fichier est utilis챕 pour trouver les entr챕es dans l'index (et non dans l'arbre de travail par le shell)."
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -49096,139 +49188,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr "git-show - Afficher diff챕rents types d'objets"
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<options>] [<objet>...]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr "Affiche un ou plusieurs objets (blobs, arbres, 챕tiquettes et commits)."
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr "Pour les commits, il affiche le message de log et la diff챕rence textuelle. Il pr챕sente 챕galement le commit de fusion dans un format sp챕cial comme produit par'git diff-tree --cc'."
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr "Pour les 챕tiquettes, il affiche le message de l'챕tiquette et les objets r챕f챕renc챕s."
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr "Pour les arbres, il affiche les noms (챕quivalent 횪'git ls-tree' avec --name only)."
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr "Pour les blobs simples, il affiche le contenu simple."
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr "La commande prend les options applicables 횪 la commande'git diff-tree' pour contr척ler comment les changements introduits par le commit sont affich챕s."
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr "Cette page manuelle d챕crit uniquement les options les plus fr챕quemment utilis챕es."
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr "<objet>..."
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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 "Les noms des objets 횪 afficher (par d챕faut:'HEAD'). Pour une liste plus compl챔te des fa챌ons d'챕peler les noms d'objets, voir la section \"SP횋CIFIER LES R횋VISIONS\" dans linkgit:gitrevisions[7]."
#. type: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr "Les options ci-dessous peuvent 챗tre utilis챕es pour modifier la fa챌on dont `git show` g챕n챔re la sortie des diff챕rences."
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr "`git show v1.0.0`"
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr "Affiche l'챕tiquette `v1.0.0`, ainsi que l'objet sur lequel elle pointe."
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr "`git show v1.0.0^{tree}`"
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr "Affiche l'arbre point챕 par l'챕tiquette `v1.0.0`."
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr "`git show -s --format=%s v1.0.0^{commit}`"
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr "Affiche le titre du commit point챕 par le tag 'v1.0.0'."
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr "`git show next~10:Documentation/README`"
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr "Affiche le contenu du fichier 'Documentation/README' tel qu'il 챕tait dans le 10챔me dernier commit de la branche 'next'."
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr "`git show master:Makefile master:t/Makefile`"
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr "Concat챔ne le contenu desdits Makefiles dans l'en-t챗te de la branche `master'."
@@ -49458,7 +49550,19 @@ msgid ""
"'git stash' clear\n"
"'git stash' create [<message>]\n"
"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
-msgstr "'git stash' list [<options-de-log>]\n'git stash' show [<options-de-diff>] [<remisage>]\n'git stash' drop [-q|--quiet] [<remisage>]\n'git stash' ( pop | apply ) [--index] [-q|--quiet] [<remisage>]\n'git stash' branch <nom-de-branche> [<remisage>]\n'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n\t [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n\t [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n\t [--] [<sp챕c-de-chemin>...]]\n'git stash' clear\n'git stash' create [<message>]\n'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
+msgstr ""
+"'git stash' list [<options-de-log>]\n"
+"'git stash' show [<options-de-diff>] [<remisage>]\n"
+"'git stash' drop [-q|--quiet] [<remisage>]\n"
+"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<remisage>]\n"
+"'git stash' branch <nom-de-branche> [<remisage>]\n"
+"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"\t [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"\t [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
+"\t [--] [<sp챕c-de-chemin>...]]\n"
+"'git stash' clear\n"
+"'git stash' create [<message>]\n"
+"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
#. type: Plain text
#: en/git-stash.txt:31
@@ -54408,7 +54512,13 @@ msgid ""
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--super-prefix=<path>] [--config-env <name>=<envvar>]\n"
" <command> [<args>]\n"
-msgstr "'git' [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n [--super-prefix=<path>] [--config-env <nom>=<var-env>]\n <commande> [<args>]\n"
+msgstr ""
+"'git' [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
+" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
+" [--super-prefix=<path>] [--config-env <nom>=<var-env>]\n"
+" <commande> [<args>]\n"
#. type: Plain text
#: en/git.txt:24
@@ -58762,7 +58872,11 @@ msgid ""
"/path/to/linked-worktree abcd1234 [master]\n"
"/path/to/locked-worktreee acbd5678 (brancha) locked\n"
"/path/to/prunable-worktree 5678abc (detached HEAD) prunable\n"
-msgstr "$ git worktree list\n/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n/chemin/vers/arbre-de-travail-verrouill챕 abcd568 (branche-a) locked\n/chemin/vers/arbre-de-travail-챕lagable 5678abcd (detached HEAD) prunable\n"
+msgstr ""
+"$ git worktree list\n"
+"/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n"
+"/chemin/vers/arbre-de-travail-verrouill챕 abcd568 (branche-a) locked\n"
+"/chemin/vers/arbre-de-travail-챕lagable 5678abcd (detached HEAD) prunable\n"
#. type: Plain text
#: en/git-worktree.txt:397
@@ -58781,7 +58895,14 @@ msgid ""
"\tlocked: working tree path is mounted on a portable device\n"
"/path/to/prunable-worktree 5678abc1 (detached HEAD)\n"
"\tprunable: gitdir file points to non-existent location\n"
-msgstr "$ git worktree list --verbose\n/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n/chemin/vers/arbre-de-travail-verrouill챕-pas-de-raison abcd5678 (HEAD d챕tach챕e) locked\nchemin/vers/arbre-de-travail-verrouill챕-avec-raison 1234abcd (branche-a)\n\tlocked: working tree path is mounted on a portable device\nchemin/vers/arbre-de-travail-elagable 5678abc1 (HEAD d챕tach챕e)\n\tprunable: gitdir file points to non-existent location\n"
+msgstr ""
+"$ git worktree list --verbose\n"
+"/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n"
+"/chemin/vers/arbre-de-travail-verrouill챕-pas-de-raison abcd5678 (HEAD d챕tach챕e) locked\n"
+"chemin/vers/arbre-de-travail-verrouill챕-avec-raison 1234abcd (branche-a)\n"
+"\tlocked: working tree path is mounted on a portable device\n"
+"chemin/vers/arbre-de-travail-elagable 5678abc1 (HEAD d챕tach챕e)\n"
+"\tprunable: gitdir file points to non-existent location\n"
#. type: Plain text
#: en/git-worktree.txt:411
@@ -58845,7 +58966,11 @@ msgid ""
"HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n"
"branch refs/heads/locked-no-reason\n"
"locked\n"
-msgstr "worktree /path/to/linked-worktree-locked-no-reason\nHEAD 5678abc5678abc5678abc5678abc5678abc5678c\nbranch refs/heads/locked-no-reason\nlocked\n"
+msgstr ""
+"worktree /path/to/linked-worktree-locked-no-reason\n"
+"HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n"
+"branch refs/heads/locked-no-reason\n"
+"locked\n"
#. type: delimited block -
#: en/git-worktree.txt:444
@@ -58855,7 +58980,11 @@ msgid ""
"HEAD 3456def3456def3456def3456def3456def3456b\n"
"branch refs/heads/locked-with-reason\n"
"locked reason why is locked\n"
-msgstr "worktree /chemin/vers/arbre-de-travail-li챕-verrouill챕-avec-raison\nHEAD 3456def3456def3456def3456def3456def3456b\nbranch refs/heads/verrrouille-avec-raison\nraison pourquoi l'arbre est verrouill챕\n"
+msgstr ""
+"worktree /chemin/vers/arbre-de-travail-li챕-verrouill챕-avec-raison\n"
+"HEAD 3456def3456def3456def3456def3456def3456b\n"
+"branch refs/heads/verrrouille-avec-raison\n"
+"raison pourquoi l'arbre est verrouill챕\n"
#. type: delimited block -
#: en/git-worktree.txt:449
@@ -58865,7 +58994,11 @@ msgid ""
"HEAD 1233def1234def1234def1234def1234def1234b\n"
"detached\n"
"prunable gitdir file points to non-existent location\n"
-msgstr "worktree /path/to/linked-worktree-prunable\nHEAD 1233def1234def1234def1234def1234def1234b\ndetached\nprunable gitdir file points to non-existent location\n"
+msgstr ""
+"worktree /path/to/linked-worktree-prunable\n"
+"HEAD 1233def1234def1234def1234def1234def1234b\n"
+"detached\n"
+"prunable gitdir file points to non-existent location\n"
#. type: Plain text
#: en/git-worktree.txt:456
@@ -58881,7 +59014,11 @@ msgid ""
"...\n"
"locked \"reason\\nwhy is locked\"\n"
"...\n"
-msgstr "$ git worktree list --porcelain\n...\nlocked \"reason\\nwhy is locked\"\n...\n"
+msgstr ""
+"$ git worktree list --porcelain\n"
+"...\n"
+"locked \"reason\\nwhy is locked\"\n"
+"...\n"
#. type: Plain text
#: en/git-worktree.txt:474
@@ -60351,19 +60488,19 @@ msgstr "Si `:<nom-de-fonction>` est donn챕 횪 la place de '<d챕but>' et de '<fin
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr "-L<d챕but>,<fin>:<fichier>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr "-L:<nom-de-fonction>:<fichier>"
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 "Tracer l'챕volution de la plage de lignes donn챕e par '<d챕but>,<fin>' (ou la regex de nom de la fonction '<nom-de-fonction>') dans le fichier '<fichier>'. Vous ne pouvez pas donner de limiteurs de sp챕cificateur de chemin. Ceci est actuellement limit챕 횪 une marche 횪 partir d'une seule r챕vision, c'est-횪-dire que vous ne pouvez donner qu'aucun ou un seul argument de r챕vision, '<d챕but>' et '<fin>' (ou '<nom-de-fonction>') doivent exister dans la r챕vision de d챕part. Vous pouvez sp챕cifier cette option plusieurs fois. Cette option implique `--patch`. L'affichage de la rustine peut 챗tre supprim챕 en utilisant `--no-patch`, mai les autres formats de diff (`--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ne sont pas implant챕s actuellement."
@@ -60819,205 +60956,205 @@ msgstr "Avec les strat챕gies qui utilisent la fusion 횪 trois points (y compris
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:240
+#, priority:100
msgid "bc4"
msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:240
+#, priority:100
msgid "gvimdiff1"
msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:240
+#, priority:100
msgid "nvimdiff1"
msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:240
+#, priority:100
msgid "vimdiff1"
msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -62495,13 +62632,13 @@ msgstr "Il y a une diff챕rence entre le fait de lister plusieurs <sp챕c-de-r챕f>
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -63120,71 +63257,75 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr "Ainsi, la commande suivante혻:"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git rev-list foo bar ^baz\n"
msgstr "$ git rev-list foo bar ^baz\n"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr "$ git log foo bar ^baz\n"
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
-msgstr "$ git rev-list origin..HEAD\n$ git rev-list HEAD ^origin\n"
+msgstr ""
+"$ git rev-list origin..HEAD\n"
+"$ git rev-list HEAD ^origin\n"
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
-msgstr "$ git log origin..HEAD\n$ git log HEAD ^origin\n"
+msgstr ""
+"$ git log origin..HEAD\n"
+"$ git log HEAD ^origin\n"
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -63192,7 +63333,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -65130,19 +65271,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr "Ajouter une ligne finale `Signed-off-by` du validateur 횪 la fin du message de validation. La signification de signoff d챕pend du projet sur lequel vous validez. Par exemple, cela peut certifier que le validateur a le droit de soumettre son travail sous la licence du projet ou accepte une certaine repr챕sentation du contributeur, tel qu'un Certificat d'Origine de D챕veloppeur. (Voir http://developercertificate.org/ pour celui utilis챕 par les projet du noyau Linux ou de Git). Consultez la documentation ou la direction du projet auquel vous contribuez pour comprendre comment les signatures sont utilis챕es dans ce projet."
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index dbdfb3e..8db689a 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -3554,55 +3554,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3619,43 +3619,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3667,25 +3667,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3698,7 +3698,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3713,7 +3713,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3728,37 +3728,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3768,85 +3768,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6003,7 +6003,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6015,7 +6015,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6976,7 +6976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7048,7 +7048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7326,7 +7326,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8145,7 +8145,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9651,19 +9651,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9684,181 +9684,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9876,313 +9876,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10192,19 +10192,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10214,25 +10214,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10240,67 +10240,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11394,7 +11394,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12255,13 +12255,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12279,13 +12279,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12435,7 +12435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12477,13 +12477,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12537,7 +12537,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12549,13 +12549,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12615,7 +12615,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12864,7 +12864,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13393,7 +13393,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15884,7 +15884,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16292,7 +16292,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31395,7 +31395,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34181,19 +34181,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34211,391 +34211,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34605,7 +34605,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34613,13 +34613,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34628,175 +34628,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44504,19 +44504,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44525,145 +44525,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44673,91 +44673,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48448,139 +48448,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59511,19 +59511,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59979,212 +59979,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61642,13 +61642,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62267,50 +62267,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62318,7 +62318,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62326,13 +62326,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62340,7 +62340,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64210,19 +64210,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 404b146..78d3315 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -3555,55 +3555,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3620,43 +3620,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3668,25 +3668,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3699,7 +3699,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3714,7 +3714,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3729,37 +3729,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3769,85 +3769,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6004,7 +6004,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6016,7 +6016,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6977,7 +6977,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7049,7 +7049,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7327,7 +7327,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8146,7 +8146,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9652,19 +9652,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9685,181 +9685,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9877,313 +9877,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10193,19 +10193,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10215,25 +10215,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10241,67 +10241,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11395,7 +11395,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12256,13 +12256,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12280,13 +12280,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12436,7 +12436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12478,13 +12478,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12538,7 +12538,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12550,13 +12550,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12616,7 +12616,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12865,7 +12865,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13394,7 +13394,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15885,7 +15885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16293,7 +16293,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31396,7 +31396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34182,19 +34182,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34212,391 +34212,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34606,7 +34606,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34614,13 +34614,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34629,175 +34629,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44505,19 +44505,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44526,145 +44526,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44674,91 +44674,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48449,139 +48449,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59512,19 +59512,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59980,212 +59980,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61643,13 +61643,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62268,50 +62268,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62319,7 +62319,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62327,13 +62327,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62341,7 +62341,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64211,19 +64211,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.is.po b/po/documentation.is.po
index b52a3ab..29a9a6d 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -3556,55 +3556,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3621,43 +3621,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3669,25 +3669,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3700,7 +3700,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3715,7 +3715,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3730,37 +3730,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3770,85 +3770,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6005,7 +6005,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6017,7 +6017,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -7007,7 +7007,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7079,7 +7079,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7357,7 +7357,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8175,7 +8175,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9685,19 +9685,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9718,181 +9718,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9910,313 +9910,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10226,19 +10226,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10248,25 +10248,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10274,67 +10274,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11424,7 +11424,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12285,13 +12285,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12309,13 +12309,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12465,7 +12465,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12507,13 +12507,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12567,7 +12567,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12579,13 +12579,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12645,7 +12645,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12894,7 +12894,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13423,7 +13423,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15955,7 +15955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16363,7 +16363,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31477,7 +31477,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34263,19 +34263,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34293,391 +34293,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34687,7 +34687,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34695,13 +34695,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34710,175 +34710,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44579,19 +44579,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44600,145 +44600,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44748,91 +44748,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48524,139 +48524,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59581,19 +59581,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60049,212 +60049,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61709,13 +61709,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62334,51 +62334,51 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, fuzzy, priority:100
+#, fuzzy, priority:260
#| msgid "support the following date formats:"
msgid "Thus, the following command:"
msgstr "sty챨ja eftirfarandi dagsetningasni챨:"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62386,7 +62386,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62394,13 +62394,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62408,7 +62408,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64278,19 +64278,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index a00fd35..7c2f5ec 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -3567,55 +3567,55 @@ msgstr "Il `NUL` extra prima del percorso di preimage nel caso rinominato 챔 que
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3632,43 +3632,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3680,25 +3680,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3711,7 +3711,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3726,7 +3726,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3741,37 +3741,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3781,85 +3781,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6036,7 +6036,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6048,7 +6048,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -7038,7 +7038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7110,7 +7110,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7388,7 +7388,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8207,7 +8207,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9712,19 +9712,19 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9745,181 +9745,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, fuzzy, priority:240
+#, fuzzy, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole"
@@ -9937,313 +9937,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "<newbranch>"
msgstr "[nuovo branch]"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10253,19 +10253,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10275,25 +10275,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10301,67 +10301,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11453,7 +11453,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12314,13 +12314,13 @@ msgstr "non visualizzare i messaggi di feedback"
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12338,13 +12338,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12494,7 +12494,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12536,13 +12536,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12596,7 +12596,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12608,13 +12608,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12674,7 +12674,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12923,7 +12923,7 @@ msgstr "Passa da un branch a un altro"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13452,7 +13452,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15974,7 +15974,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16382,7 +16382,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31490,7 +31490,7 @@ msgstr "linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34279,19 +34279,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34309,391 +34309,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:280
msgid "merge"
msgstr "emerge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34703,7 +34703,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34711,13 +34711,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34726,175 +34726,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44600,19 +44600,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44621,145 +44621,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44769,91 +44769,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48548,139 +48548,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "git show [<opzioni>] <oggetto>..."
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59616,19 +59616,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60084,212 +60084,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61747,13 +61747,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62372,50 +62372,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, fuzzy, priority:100
+#, fuzzy, priority:260
msgid "Thus, the following command:"
msgstr "supporta i seguenti formati di data:"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62423,7 +62423,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62431,13 +62431,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62445,7 +62445,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64315,19 +64315,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, fuzzy, priority:100
+#, fuzzy, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr "Aggiungi linea firmata fuori dal committer alla fine del messaggio di registro di commit. Il significato di una firma dipende dal progetto, ma in genere certifica che il committer ha i diritti di presentare quest'opera con la stessa licenza e accetta un certificato di origine per sviluppatori (vedere http://developercertificate.org/ per ulteriori informazioni)."
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.ja.po b/po/documentation.ja.po
index 29f09f6..1bc6ef3 100644
--- a/po/documentation.ja.po
+++ b/po/documentation.ja.po
@@ -3557,55 +3557,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3622,43 +3622,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3670,25 +3670,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3701,7 +3701,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3716,7 +3716,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3731,37 +3731,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3771,85 +3771,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6006,7 +6006,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6018,7 +6018,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6979,7 +6979,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7051,7 +7051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7329,7 +7329,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8147,7 +8147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9653,19 +9653,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9686,181 +9686,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9878,313 +9878,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10194,19 +10194,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10216,25 +10216,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10242,67 +10242,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11391,7 +11391,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12252,13 +12252,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12276,13 +12276,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12432,7 +12432,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12474,13 +12474,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12534,7 +12534,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12546,13 +12546,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12612,7 +12612,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12861,7 +12861,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13390,7 +13390,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15880,7 +15880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16288,7 +16288,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31389,7 +31389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34175,19 +34175,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34205,391 +34205,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34599,7 +34599,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34607,13 +34607,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34622,175 +34622,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44491,19 +44491,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44512,145 +44512,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44660,91 +44660,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48435,139 +48435,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59491,19 +59491,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr "-L <start>,<end>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr "-L :<funcname>"
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59959,212 +59959,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61619,13 +61619,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62244,50 +62244,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62295,7 +62295,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62303,13 +62303,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62317,7 +62317,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64187,19 +64187,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 6338cc6..3edaa8a 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -3555,55 +3555,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3620,43 +3620,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3668,25 +3668,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3699,7 +3699,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3714,7 +3714,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3729,37 +3729,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3769,85 +3769,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6002,7 +6002,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6014,7 +6014,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6980,7 +6980,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7052,7 +7052,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7330,7 +7330,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8149,7 +8149,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9655,19 +9655,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9688,181 +9688,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9880,313 +9880,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10196,19 +10196,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10218,25 +10218,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10244,67 +10244,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11398,7 +11398,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12259,13 +12259,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12283,13 +12283,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12439,7 +12439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12481,13 +12481,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12541,7 +12541,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12553,13 +12553,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12619,7 +12619,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12868,7 +12868,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13397,7 +13397,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15888,7 +15888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16296,7 +16296,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31396,7 +31396,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34182,19 +34182,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34212,391 +34212,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34606,7 +34606,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34614,13 +34614,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34629,175 +34629,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44503,19 +44503,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44524,145 +44524,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44672,91 +44672,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48447,139 +48447,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59504,19 +59504,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59972,212 +59972,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61633,13 +61633,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62258,50 +62258,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62309,7 +62309,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62317,13 +62317,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62331,7 +62331,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64201,19 +64201,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index d0fff95..7571e3f 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -3555,55 +3555,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3620,43 +3620,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3668,25 +3668,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3699,7 +3699,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3714,7 +3714,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3729,37 +3729,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3769,85 +3769,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6002,7 +6002,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6014,7 +6014,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6975,7 +6975,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7047,7 +7047,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7325,7 +7325,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8144,7 +8144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9650,19 +9650,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9683,181 +9683,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9875,313 +9875,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10191,19 +10191,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10213,25 +10213,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10239,67 +10239,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11393,7 +11393,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12254,13 +12254,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12278,13 +12278,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12434,7 +12434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12476,13 +12476,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12536,7 +12536,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12548,13 +12548,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12614,7 +12614,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12863,7 +12863,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13392,7 +13392,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15883,7 +15883,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16291,7 +16291,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31391,7 +31391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34177,19 +34177,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34207,391 +34207,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34601,7 +34601,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34609,13 +34609,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34624,175 +34624,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44498,19 +44498,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44519,145 +44519,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44667,91 +44667,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48442,139 +48442,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59504,19 +59504,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59972,212 +59972,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61633,13 +61633,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62258,50 +62258,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62309,7 +62309,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62317,13 +62317,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62331,7 +62331,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64201,19 +64201,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 304c885..72cc0cd 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -3553,55 +3553,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3618,43 +3618,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3666,25 +3666,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3697,7 +3697,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3712,7 +3712,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3727,37 +3727,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3767,85 +3767,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6002,7 +6002,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6014,7 +6014,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6976,7 +6976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7048,7 +7048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7326,7 +7326,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8145,7 +8145,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9652,19 +9652,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9685,181 +9685,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9877,313 +9877,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10193,19 +10193,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10215,25 +10215,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10241,67 +10241,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11395,7 +11395,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12256,13 +12256,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12280,13 +12280,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12436,7 +12436,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12478,13 +12478,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12538,7 +12538,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12550,13 +12550,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12616,7 +12616,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12865,7 +12865,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13394,7 +13394,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15885,7 +15885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16293,7 +16293,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31398,7 +31398,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34184,19 +34184,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34214,391 +34214,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34608,7 +34608,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34616,13 +34616,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34631,175 +34631,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44507,19 +44507,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44528,146 +44528,146 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--source"
msgid "--source=<tree>"
msgstr "--source"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44677,91 +44677,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48452,139 +48452,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59522,19 +59522,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59990,212 +59990,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61666,13 +61666,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62291,50 +62291,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62342,7 +62342,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62350,13 +62350,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62364,7 +62364,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64234,19 +64234,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 16c442b..dd91655 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -3554,55 +3554,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3619,43 +3619,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3667,25 +3667,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3698,7 +3698,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3713,7 +3713,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3728,37 +3728,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3768,85 +3768,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6003,7 +6003,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6015,7 +6015,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6983,7 +6983,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7055,7 +7055,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7333,7 +7333,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8152,7 +8152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9659,19 +9659,19 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9692,181 +9692,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9884,313 +9884,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10200,19 +10200,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10222,25 +10222,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10248,67 +10248,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11402,7 +11402,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12263,13 +12263,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12287,13 +12287,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12443,7 +12443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12485,13 +12485,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12545,7 +12545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12557,13 +12557,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12623,7 +12623,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12872,7 +12872,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13401,7 +13401,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15892,7 +15892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16300,7 +16300,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31406,7 +31406,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34192,19 +34192,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34222,391 +34222,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34616,7 +34616,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34624,13 +34624,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34639,175 +34639,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44546,19 +44546,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44567,146 +44567,146 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--source"
msgid "--source=<tree>"
msgstr "--source"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44716,91 +44716,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48520,139 +48520,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59641,19 +59641,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60111,212 +60111,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61787,13 +61787,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62412,50 +62412,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62463,7 +62463,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62471,13 +62471,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62485,7 +62485,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64370,19 +64370,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index ace3636..9b8f927 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -3554,55 +3554,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3619,43 +3619,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3667,25 +3667,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3698,7 +3698,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3713,7 +3713,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3728,37 +3728,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3768,85 +3768,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6003,7 +6003,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6015,7 +6015,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6981,7 +6981,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7053,7 +7053,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7331,7 +7331,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8150,7 +8150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9657,19 +9657,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9690,181 +9690,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9882,313 +9882,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10198,19 +10198,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10220,25 +10220,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10246,67 +10246,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11400,7 +11400,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12261,13 +12261,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12285,13 +12285,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12441,7 +12441,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12483,13 +12483,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12543,7 +12543,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12555,13 +12555,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12621,7 +12621,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12870,7 +12870,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13399,7 +13399,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15898,7 +15898,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16306,7 +16306,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31413,7 +31413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34199,19 +34199,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34229,391 +34229,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34623,7 +34623,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34631,13 +34631,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34646,175 +34646,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44552,19 +44552,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44573,145 +44573,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44721,91 +44721,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48496,139 +48496,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59562,19 +59562,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60030,212 +60030,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61693,13 +61693,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62318,50 +62318,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62369,7 +62369,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62379,13 +62379,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62393,7 +62393,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64306,19 +64306,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 7908140..dc768e3 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -3,7 +3,18 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
-msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 13:35+0100\nPO-Revision-Date: 2021-03-27 08:29+0000\nLast-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\nLanguage-Team: none\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.6-dev\n"
+msgstr ""
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-02-27 13:35+0100\n"
+"PO-Revision-Date: 2021-03-27 08:29+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.6-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:738 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
@@ -3593,55 +3604,55 @@ msgstr "O `NUL` extra antes do caminho da pr챕-imagem 챕 renomeado para permitir
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr "Gerando a corre챌찾o em um formato texto com a op챌찾o `-p`"
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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])."
#. type: Plain text
#: en/diff-generate-patch.txt:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr "O que a op챌찾o `-p` produz 챕 um pouco diferente do formato diff tradicional:"
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr "Ele 챕 precedido por um cabe챌alho \"git diff\" que se parece com:"
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/arquivo1 b/arquivo2\n"
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr "Os nomes dos arquivos `a/` e `b/` s찾o os mesmos a menos que haja uma renomea챌찾o ou c처pia. Especialmente para uma cria챌찾o ou exclus찾o, `/dev/null` _n찾o_ 챕 utilizado no lugar dos nomes do arquivo `a/` ou `b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:30
-#, priority:260
+#, priority:280
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr "Quando h찼 um envolvimento no processo de renomear ou copiar, `arquivo1` e `arquivo2` exibem o nome do arquivo de origem da renomea챌찾o ou c처pia e o nome do arquivo produzido pela renomea챌찾o ou copia respectivamente."
#. type: Plain text
#: en/diff-generate-patch.txt:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr "횋 seguido por uma ou mais linhas estendidas do cabe챌alho:"
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3669,43 +3680,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr "Os modos dos arquivo s찾o impressos como n첬meros octais com 6 d챠gitos, incluindo o tipo do arquivo e dos bits de permiss찾o do arquivo."
#. type: Plain text
#: en/diff-generate-patch.txt:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr "Os nomes do caminho nos cabe챌alhos estendidos n찾o incluem os prefixos `a/` e `b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr "O 챠ndice de similaridade 챕 a porcentagem das linhas inalteradas e o 챠ndice de dissimilaridade 챕 a porcentagem das linhas alteradas. 횋 um n첬mero inteiro arredondado, seguido por um sinal de porcentagem. O valor do 챠ndice de similaridade de 100% 챕 reservado para dois arquivos iguais, enquanto a dissimilaridade de 100% significa que nenhuma linha do arquivo antigo chegou ao novo."
#. type: Plain text
#: en/diff-generate-patch.txt:60
-#, priority:260
+#, priority:280
msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr "A linha do 챠ndice inclui os nomes dos objetos bolha antes e depois da altera챌찾o. O `<modo>` ser찼 inclu챠do caso o modo do arquivo n찾o seja alterado; caso contr찼rio, linhas separadas indicam o modo antigo e o novo."
#. type: Plain text
#: en/diff-generate-patch.txt:64
-#, priority:260
+#, priority:280
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr "Os nomes dos caminhos com caracteres \"incomuns\" s찾o citados como j찼 explicado na vari찼vel de configura챌찾o `core.quotePath` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:69
-#, priority:260
+#, priority:280
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
msgstr "Todos os arquivos `arquivo1` na sa챠da se referem aos arquivos antes do commit e todos os arquivos `arquivo2` se referem aos arquivos ap처s o commit. 횋 incorreto aplicar cada altera챌찾o em cada arquivo sequencialmente. Por exemplo, este patch ir찼 substituir a e b:"
#. type: Plain text
#: en/diff-generate-patch.txt:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3723,25 +3734,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr "O formato diff combinado"
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr "Qualquer comando que gere um diff pode utilizar a op챌찾o `-c` ou`--cc` para produzir um 'diff combinado' ao mostrar uma mesclagem. Este 챕 o formato predefinido ao mostrar as mesclagens com linkgit:git-diff[1] ou linkgit:git-show[1]. Observe tamb챕m que 챕 poss챠vel usar a op챌찾o `--diff-merges` que 챕 adequada para qualquer um destes comandos para impor a gera챌찾o dos diffs em um determinado formato."
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr "Um formato \"diff combinado\" fica assim:"
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3761,7 +3772,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3785,7 +3796,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3809,37 +3820,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr "Ele 챕 precedido por um cabe챌alho \"git diff\" parecido com este (quando a op챌찾o `-c` 챕 utilizada):"
#. type: Plain text
#: en/diff-generate-patch.txt:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr "diff --combined arquivo\n"
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr "ou assim (quando a op챌찾o `--cc` 챕 utilizada):"
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr " diff --cc arquivo\n"
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr "Ele 챕 seguido por uma ou mais linhas estendidas do cabe챌alho (este exemplo exibe uma mesclagem com duas origens):"
#. type: Plain text
#: en/diff-generate-patch.txt:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3853,85 +3864,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr "A linha `modo <modo>,<modo>..<modo>` aparece apenas caso pelo menos um dos <modos> seja diferente do restante. Os cabe챌alhos estendidos com informa챌천es sobre a movimenta챌찾o do conte첬do detectado (renomea챌찾o e detec챌찾o da c처pia) s찾o projetados para trabalhar com o diff com duas `<찼rvore>s` e n찾o s찾o utilizados pela combina챌찾o do formato diff."
#. type: Plain text
#: en/diff-generate-patch.txt:144
-#, priority:260
+#, priority:280
msgid "It is followed by two-line from-file/to-file header"
msgstr "횋 seguido por duas linhas do cabe챌alho do arquivo/para o arquivo"
#. 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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr "a/arquivo"
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr "b/arquivo"
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr "Semelhante ao cabe챌alho de duas linhas para o formato diff tradicional 'unificado', o `/dev/null` 챕 utilizado para sinalizar os arquivos criados ou exclu챠dos."
#. type: Plain text
#: en/diff-generate-patch.txt:155
-#, priority:260
+#, priority:280
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 "No entanto, caso a op챌찾o `--combined-all-paths` seja utilizada, em vez de duas linhas do arquivo/para o arquivo, ser찼 obtido um cabe챌alho `N+1` do cabe챌alho do arquivo de \"origem\" para o arquivo de \"destino\" onde N 챕 a quantidade de origens na mesclagem do commit"
#. type: Plain text
#: en/diff-generate-patch.txt:164
-#, priority:260
+#, priority:280
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 "Este formato estendido pode ser 첬til caso a detec챌찾o da renomea챌찾o ou c처pia esteja ativa, permitindo que voc챗 veja o nome original do arquivo em diferentes origens."
#. type: Plain text
#: en/diff-generate-patch.txt:170
-#, priority:260
+#, priority:280
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr "O formato do cabe챌alho do peda챌o 챕 modificado para prevenir que as pessoas o alimentem acidentalmente com `patch -p1`. O formato diff combinado foi criado para revisar as altera챌천es da mesclagem dos commits e n찾o era para ser aplicado. A altera챌찾o 챕 semelhante a altera챌찾o no cabe챌alho estendido do '챠ndice':"
#. type: Plain text
#: en/diff-generate-patch.txt:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr "Existem (a quantidade de origens + 1) caracteres `@` no cabe챌alho do bloco para o formato diff combinado."
#. type: Plain text
#: en/diff-generate-patch.txt:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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 "Diferente do formato diff 'unificado' tradicional que exiba os dois arquivos A e B com uma 첬nica coluna que possua o sinal de menos `-` (o sinal de menos -- aparece em A mas 챕 removido em B), `+` (o sinal de mais -- ausente em A, mas adicionado em B), ou o prefixo `\" \"` (sem altera챌찾o -- de espa챌o), este formato compara dois ou mais arquivos arquivo1, arquivo2, ... com um arquivo X e exibe como X difere de cada arquivoN. Uma coluna para cada arquivoN 챕 anexada 횪 linha de sa챠da para observar como a linha de X 챕 diferente dela."
#. type: Plain text
#: en/diff-generate-patch.txt:190
-#, priority:260
+#, priority:280
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr "Um caractere `-` na coluna N significa que a linha aparece no \"arquivoN\", mas n찾o aparece no resultado. Um caractere `+` na coluna N significa que a linha aparece no resultado e o arquivoN n찾o possui essa linha (em outras palavras, a linha foi adicionada, do ponto de vista dessa origem)."
#. type: Plain text
#: en/diff-generate-patch.txt:196
-#, priority:260
+#, priority:280
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr "Na sa챠da do exemplo acima, a assinatura da fun챌찾o foi alterada nos dois arquivos (portanto, duas remo챌천es `-` do arquivo1 e do arquivo2, mais `++` significa que uma linha que foi adicionada n찾o aparece no arquivo1 ou no arquivo2). Outras oito linhas tamb챕m s찾o iguais no arquivo1, mas n찾o aparecem no arquivo2 (portanto, prefixadas com `+`)."
#. type: Plain text
#: en/diff-generate-patch.txt:202
-#, priority:260
+#, priority:280
msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr "Quando exibido pelo comando `git diff-tree -c`, compara as origens de um commit mesclado com o resultado da mesclagem (ou seja, arquivo1..arquivoN s찾o as origens). Quando exibido pelo comando `git diff-files -c`, as duas origens com as suas respectivas mesclagens n찾o resolvidas com o arquivo da 찼rvore de trabalho (ou seja, arquivo1 챕 o est찼gio 2, informado como \"nossa vers찾o\", o arquivo2 챕 o est찼gio 3, informado como \"a vers찾o deles\")."
@@ -6101,7 +6112,7 @@ msgstr "Normalmente, as capturas remotas dos m첬ltiplos ramos de forma paralela
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6113,7 +6124,7 @@ msgstr "Desative a captura recursiva dos subm처dulos (tem o mesmo efeito que uti
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -7111,7 +7122,7 @@ msgstr "A lista dos arquivos da caixa de correio para leitura dos patches. Caso
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7183,7 +7194,7 @@ msgstr "Ignore linhas \"scissors\" (tesouras) (veja linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7463,7 +7474,7 @@ msgstr "Quando ocorrer uma falha no patch, a `<msg>` ser찼 exibida na tela antes
#. 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8295,7 +8306,7 @@ msgstr "Formato do arquivo resultante: 'tar' ou 'zip'. Caso esta op챌찾o n찾o se
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9889,19 +9900,19 @@ msgstr "Consulte linkgit:gitmailmap[5]."
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr "git-branch - Lista, cria ou exclui ramifica챌천es"
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9937,181 +9948,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr "Caso a op챌찾o `--list` seja utilizada ou caso n찾o haja argumentos n찾o opcionais, as ramifica챌천es existentes ser찾o listadas; o ramo atual ser찼 destacado em verde e marcado com um asterisco. Quaisquer ramifica챌천es retiradas das 찼reas de trabalho vinculadas, ser찾o destacadas em ciano e marcadas com um sinal de adi챌찾o. A op챌찾o `-r` faz com que as ramifica챌천es monitoradas remotamente sejam listadas, a op챌찾o `-a` exibe as ramifica챌천es locais e as remotas."
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr "Caso um `<padr찾o>` seja informado, ele ser찼 utilizado como um curinga do shell para restringir a sa챠da das ramifica챌천es correspondentes. Caso v찼rios padr천es sejam informados, um ramo ser찼 exibido caso coincida com qualquer um dos padr천es."
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr "Note que ao fornecer um `<padr찾o>` voc챗 deve utilizar `--list`; caso contr찼rio, o comando pode ser interpretado como uma cria챌찾o do ramo."
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr "Com a op챌찾o `--contains`, exibe apenas os ramos que contenham o commit informado (em outras palavras, os ramos cujos commits do topo sejam os descendentes do commit informado),`--no-contains` funciona ao contr찼rio. Com a op챌찾o `--merged`, apenas as ramifica챌천es mescladas no commit informado ser찾o listados (ou seja, os ramos cujos commits do cume esteja acess챠vel a partir do commit informado). Com `--no-merged', ser찾o listados apenas as ramifica챌천es n찾o mescladas do commit informado. Caso o argumento `<commit>` esteja ausente, a predefini챌찾o retorna para `HEAD` (ou seja, o do ramo atual)."
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr "O segundo formul찼rio do comando cria um novo cabe챌alho do ramo informado `<nome-do-ramo>` (nome do ramo0), que aponta para o `HEAD` atual, ou o `<ponto-de-partida>` caso seja utilizado. Como um caso especial, para o `<ponto-de-partida>`, utilize `\"A...B\"` como um atalho para a base da mesclagem de `A` e `B` caso sejam exatamente uma base para ser mesclada. Voc챗 pode deixar de fora no m찼ximo um de `A` e `B`, caso onde a predefini챌찾o retorna para `HEAD`."
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr "Observe que isso criar찼 a nova ramifica챌찾o mas n찾o mudar찼 a 찼rvore de trabalho para ela; para alternar para a nova ramifica챌찾o utilize \"git switch <novo-ramo>\"."
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr "Quando uma ramifica챌찾o local 챕 iniciada em uma ramifica챌찾o remotamente monitorada, o Git define a ramifica챌찾o (especificamente as entradas da configura챌찾o `branch.<nome>.remote` e `branch.<nome>.merge`) para que o comando 'git pull' mescle adequadamente a partir do ramo monitorado remotamente. Este comportamento pode ser alterado atrav챕s da vari찼vel de configura챌찾o global `branch.autoSetupMerge`. Esta configura챌찾o pode ser substitu챠da utilizando as op챌천es `--track` e `--no-track`, podendo ser alterada posteriormente utilizando o comando `git branch --set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr "Com uma op챌찾o `-m` ou `-M`, o ramo antigo `<ramo-antigo>` ser찼 renomeado para o novo ramo `<novo-ramo>`. Caso o `<ramo-antigo>` tenha um reflog correspondente, ele ser찼 renomeado para coincidir com o `<novo-ramo>`, uma entrada de reflog ser찼 criada para lembrar da renomea챌찾o do ramo. Caso `<novo-ramo>` exista, -M deve ser utilizado para impor que a renomea챌찾o aconte챌a."
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr "As op챌천es `-c` e `-C` t챗m exatamente a mesma sem창ntica que `-m` e `-M`, exceto que em vez do ramo que est찼 sendo renomeado, ele ser찼 copiado com um novo nome junto com a sua configura챌찾o e o reflog ."
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr "Com uma op챌찾o `-d` ou `-D`, o `<nome-do-ramo>` ser찼 exclu챠do. Voc챗 pode informar mais de uma ramifica챌찾o para ser exclu챠do. Caso o ramo tiver atualmente um reflog, este tamb챕m ser찼 exclu챠do."
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr "Utilize a op챌찾o `-r` junto com `-d` para excluir o monitoramento das ramifica챌천es remotas. Observe que s처 faz sentido excluir o monitoramento das ramifica챌천es remotas caso elas n찾o existam mais no reposit처rio remoto ou caso o comando 'git fetch' tenha sido configurado para n찾o resgat찼-las novamente. Consulte tamb챕m o subcomando 'prune' linkgit:git-remote[1] para conhecer uma maneira de limpar todos os monitoramentos obsoletos das ramifica챌천es remotas."
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr "Exclua uma ramifica챌찾o. A ramifica챌찾o deve ser totalmente mesclada sua ramifica챌찾o \"upstream\" ou no `HEAD` caso nenhum \"upstream\" tenha sido definido, utilize `--track` ou `--set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr "Um atalho para `--delete --force`."
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr "Crie o reflog do ramo. Ativa a grava챌찾o de todas as altera챌천es feitas no \"ref\" do ramo, permitindo a utiliza챌찾o de express천es sha1 baseadas na data, como `<nome-do-ramo>@\\{yesterday}`. Observe que nos reposit처rios que n찾o estiverem vazios, 챕 predefinido que os reflogs geralmente sejam ativados atrav챕s da vari찼vel de configura챌찾o `core.logAllRefUpdates`. A forma negada o comando `--no-create-reflog` substitui apenas um `--create-reflog` anterior, mas atualmente n찾o nega a configura챌찾o do `core.logAllRefUpdates`."
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr "Redefina o `<nome-do-ramo>` para `<startpoint>`, mesmo se o `<nome-do-ramo>` j찼 existir. Sem o `-f`, o comando 'git branch' se recusa a alterar uma ramifica챌찾o j찼 existente. Em combina챌찾o com `-d` (ou `--delete`), permita excluir a ramifica챌찾o, independentemente da sua condi챌찾o de mesclagem. Em combina챌찾o com `-m` (ou `--move`), permita renomear a ramifica챌찾o, mesmo que o novo nome do ramo j찼 exista, o mesmo se aplica com `-c` (ou `--copy`)."
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr "Mover / renomear uma ramifica챌찾o e o reflog correspondente."
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr "-M"
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr "Atalho para `--mover --for챌a`."
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
msgid "Copy a branch and the corresponding reflog."
msgstr "Copie uma ramifica챌찾o e o reflogo correspondente."
#. type: Plain text
#: en/git-branch.txt:136 en/git-fast-export.txt:54 en/git-rebase.txt:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr "-C"
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr "Shortcut for `--c처pia --for챌a`."
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr "Colora as ramifica챌천es para dar destaque nas ramifica챌천es atuais, locais e monitoradas remotamente. Always (sempre) 챕 o valor predefinido, as outras op챌천es s찾o \"never\" ou \"auto\"."
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr "Desative as cores do ramo, mesmo quando o arquivo de configura챌찾o informar o valor predefinido para a sa챠da das cores. O mesmo que `--color=never`."
#. 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "As ramifica챌천es de classifica챌찾o e filtragem n찾o diferenciam mai첬sculas de min첬sculas."
@@ -10129,313 +10140,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr "Exiba lista dos ramos em colunas. Para conhecer a sintaxe da op챌찾o, consulte a vari찼vel de configura챌찾o `column.branch`. `--column` e `--no-column` sem op챌천es s찾o respectivamente o mesmo que 'always' e 'never'."
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr "Esta op챌찾o 챕 aplic찼vel apenas no modo n찾o detalhado."
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr "Liste ou exclua (se utilizado com -d) as ramifica챌천es rastreadas remotamente. Combine com a op챌찾o `--list` para coincidir com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr "Liste ambas as ramifica챌천es rastreadas remotamente e as ramifica챌천es locais. Combine com a op챌찾o `--list` para que coincida com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr "Lista as ramifica챌천es. Com o `<padr찾o>...` opcional, o comando `git branch --list 'maint-*'`, lista apenas as ramifica챌천es que coincidam com os padr천es."
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr "Exiba o nome do ramo atual. Na condi챌찾o onde `HEAD` esteja desanexado, nada 챕 impresso."
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr "Quando estiver no modo de listagem, exiba o sha1 e confirme a linha do assunto para cada cabe챌alho, juntamente com o relacionamento com o ramo \"upstream\" (caso haja). Se utilizado duas vezes, exiba a vincula챌찾o do caminho da 찼rvore de trabalho (caso haja) e o nome do ramo \"upstream\" (consulte tamb챕m `git remote show <remoto>`). Observe que o `HEAD` da 찼rvore de trabalho atual n찾o ter찼 o seu caminho mostrado (sempre ser찼 seu diret처rio atual)."
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr "Seja mais silencioso ao criar ou excluir uma ramifica챌찾o, suprimindo as mensagens que n찾o sejam de erro."
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr "Na listagem louquaz que exibe o nome do objeto que foi feito o commit, exibe o prefixo mais curto que se refira de forma 첬nica ao objeto e que tenha at챕 '<n>' hexdigits . O valor predefinido 챕 7, pode ser substitu챠do atrav챕s da vari찼vel de configura챌찾o `core.abbrev`."
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr "Exibe o sha1 completo na sa챠da da listagem em vez de abrevi찼-los."
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr "Ao criar uma nova ramifica챌찾o, configure as entradas da configura챌찾o `branch.<nome>.remote` e `branch.<nome>.merge` para marcar a ramifica챌찾o do ponto do in챠cio como \"upstream\" partindo da nova ramifica챌찾o. Esta configura챌찾o instruir찼 o git a exibir o relacionamento entre as duas ramifica챌천es com o `git status` e com o `git branch -v`. Al챕m disso, ele direciona o `git pull` sem argumentos para extrair do \"upstream\" quando o novo ramo for retirado."
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr "Este 챕 o comportamento predefinido quando o ponto inicial for uma ramifica챌찾o rastreada remotamente. Defina a vari찼vel de configura챌찾o `branch.autoSetupMerge` como `false` caso queira que o `git switch`, `git checkout` e o `git branch` sempre se comportem como se a op챌찾o `--no-track` fosse utilizada. Defina-o como `always` caso queira que este comportamento quando o ponto de partida for uma ramifica챌찾o local ou rastreada remotamente."
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr "N찾o configure o \"upstream\", ainda que a vari찼vel de configura챌찾o `branch.autoSetupMerge` seja verdadeira."
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr "Como esta op챌찾o tinha a sintaxe confusa, agora ela 챕 obsoleta. Utilize `--track` ou `--set-upstream-to`."
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr "-u <upstream>"
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr "--set-upstream-to=<upstream>"
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr "Configure as informa챌천es do monitoramento do `<nome-do-ramo>` para que o `<upstream>` seja considerado o ramo \"upstream\" do `<nome-do-ramo>`. Caso nenhum `<nome-do-ramo>` seja utilizado, ent찾o a predefini챌찾o retorna para o ramo atual."
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr "Remova as informa챌천es \"upstream\" para o `<nome-do-ramo>`. Caso nenhuma ramifica챌찾o seja utilizada, a predefini챌찾o retorna para a ramifica챌찾o atual."
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr "Abra um editor e edite o texto para explicar para que serve a ramifica챌찾o, para ser utilizado por outros comandos (`format-patch`, `request-pull` e `merge` por exemplo (se ativado)). Podem ser utilizadas as explica챌천es em mais de uma linha."
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr "--contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "Listar apenas as ramifica챌천es que contenham o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`."
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr "--no-contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr "Liste apenas as ramifica챌천es que n찾o contenha o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`."
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr "--merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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`."
#. type: Labeled list
#: en/git-branch.txt:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr "--no-merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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`."
#. type: Labeled list
#: en/git-branch.txt:263
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr "<nome-do-ramo>"
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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 "O nome do ramo que ser찼 criada ou exclu챠da. O nome da nova ramifica챌찾o deve passar em todas as verifica챌천es definidas pelo linkgit:git-check-ref-format[1]. Algumas dessas verifica챌천es podem restringir os caracteres permitidos no nome de uma ramifica챌찾o."
#. type: Labeled list
#: en/git-branch.txt:269 en/git-switch.txt:42
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr "<ponto-de-partida>"
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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 "O cabe챌alho da nova ramifica챌찾o apontar찼 para este commit. Pode ser utilizado como um nome do ramo, um ID do commit ou uma tag. Caso esta op챌찾o seja omitida, o `HEAD` atual ser찼 utilizado."
#. type: Labeled list
#: en/git-branch.txt:274
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr "<ramo-antigo>"
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr "O nome de uma ramifica챌찾o existente que ser찼 renomeada."
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<novo-ramo>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
msgstr "Um novo nome para um ramo j찼 existente. Se aplicam as mesmas restri챌천es para `<nome-do-ramo>`."
#. 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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr "--sort=<chave>"
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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 "Classifique com base na chave informada. O prefixo `-` 챕 utilizado para classificar em ordem decrescente. Voc챗 pode utilizar a op챌찾o `--sort=<chave>` mais de uma vez; nesse caso, a 첬ltima chave se torna a chave prim찼ria. As chaves compat챠veis s찾o as mesmas que as do `git for-each-ref`. A predefini챌찾o da ordem da classifica챌찾o retorna para o valor configurado para a vari찼vel `branch.sort`, caso exista ou a classifica챌찾o com base no nome completo da \"ref\" (incluindo o prefixo `refs/...`). Isso lista primeiro o `HEAD` desanexado (caso esteja presente), depois as ramifica챌천es locais e finalmente as ramifica챌천es monitoradas remotamente. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:293 en/git-tag.txt:158
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr "--points-at <objeto>"
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr "Apenas lista os objetos das ramifica챌천es informadas."
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr "--format <formato>"
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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 "Uma cadeia de caracteres que interpola `%(fieldname)` de uma tag \"ref\" que est찼 sendo exibida e o objeto para o qual ele aponta. O formato 챕 o mesmo do linkgit:git-for-each-ref[1]."
#. type: Plain text
#: en/git-branch.txt:306
-#, priority:240
+#, priority:260
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 "O `pager.branch` 챕 respeitado apenas ao listar as ramifica챌천es, ou seja, quando a op챌찾o `--list` 챕 utilizado ou impl챠cito. A predefini챌찾o 챕 utilizar um pager. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:310
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr "Inicie o desenvolvimento a partir de uma tag conhecida"
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10449,19 +10460,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
msgid "This step and the next one could be combined into a single step with \"checkout -b my2.6.14 v2.6.14\"."
msgstr "Esta etapa e a pr처xima poderiam ser combinadas em uma 첬nica etapa com \"checkout -b my2.6.14 v2.6.14\"."
#. type: Labeled list
#: en/git-branch.txt:322
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr "Exclua um ramo que seja desnecess찼rio"
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10475,25 +10486,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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 "Exclua as ramifica챌천es rastreadas remotamente \"todo\", \"html\" e \"man\". O pr처ximo 'fetch' (resgate) ou 'pull' (captura) os criar찼 novamente a menos que voc챗 os configure para n찾o faz챗-lo. Consulte linkgit:git-fetch[1]."
#. type: Plain text
#: en/git-branch.txt:336
-#, priority:240
+#, priority:260
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 "Exclua o ramo \"teste\", mesmo que o ramo \"principal\" (ou o ramo que est찼 com a averigua챌찾o no momento) n찾o tenha todos os commits do ramo do teste."
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr "Listando as ramifica챌천es de um determinado ponto remoto"
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10503,67 +10514,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr "Utilizando a op챌찾o `-a` entraria em conflito com `<remoto>` em quaisquer ramifica챌천es locais que foram prefixadas com o mesmo padr찾o `<remoto>`."
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr "'for-each-ref' pode ter uma ampla gama de op챌천es. Consulte linkgit:git-for-each-ref[1] Consulte linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr "Os padr천es normalmente precisam ser citados."
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr "OBSERVA횉횛ES"
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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 "Caso esteja criando uma nova ramifica챌찾o para o qual deseja alternar imediatamente 챕 mais f찼cil usar o comando \"git switch\" com a sua op챌찾o `-c` para fazer a mesma coisa utilizando apenas um 첬nico comando."
#. type: Plain text
#: en/git-branch.txt:359
-#, priority:240
+#, priority:260
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
msgstr "As op챌천es `--contains`, `--no-contains`, `--merged` e `--no-merged` servem para quatro finalidades relacionadas, por챕m diferentes:"
#. type: Plain text
#: en/git-branch.txt:363
-#, priority:240
+#, priority:260
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 "`--contains <commit>` 챕 utilizado para encontrar todas as ramifica챌천es que precisar찾o de aten챌찾o especial caso `<commit>` precise de um novo \"rebase\" ou corrigido, uma vez que essas ramifica챌천es cont챗m o `<commit>` informato."
#. type: Plain text
#: en/git-branch.txt:366
-#, priority:240
+#, priority:260
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
msgstr "`--no-contains <commit>` 챕 o inverso, isto 챕, as ramifica챌천es que n찾o cont챗m o `<commit>` informado."
#. type: Plain text
#: en/git-branch.txt:369
-#, priority:240
+#, priority:260
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
msgstr "`--merged` 챕 utilizado para encontrar todas as ramifica챌천es que podem ser exclu챠das com seguran챌a, uma vez que essas ramifica챌천es s찾o totalmente contidas pelo `HEAD`."
#. type: Plain text
#: en/git-branch.txt:372
-#, priority:240
+#, priority:260
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 "`--no-merged` 챕 utilizado para encontrar as ramifica챌천es candidatas a serem mescladas no `HEAD`, uma vez que essas ramifica챌천es n찾o s찾o totalmente contidas pelo `HEAD`."
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Compreendendo a hist처ria: O que 챕 um ramo?''] no Manual do Usu찼rio Git."
@@ -11691,7 +11702,7 @@ msgstr "Considere o `.gitattributos` apenas no 챠ndice, ignorando a 찼rvore de t
#. 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12585,13 +12596,13 @@ msgstr "Silencioso, suprima as mensagens de feedback."
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr "A condi챌찾o do progresso 챕 relatado no fluxo de erro predefinido ao estar conectado em um terminal, a menos que as op챌천es `--quiet` seja utilizados. Esta op챌찾o ativa os relat처rios de progresso, mesmo que n찾o estejam anexados a um terminal, independentemente da op챌찾o `--quiet`."
@@ -12609,13 +12620,13 @@ msgstr "Ao verificar os caminhos do 챠ndice, n찾o falhe em entradas n찾o mesclad
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12765,7 +12776,7 @@ msgstr "Caso queira iniciar um hist처rico desconectado que registre um conjunto
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12807,13 +12818,13 @@ msgstr "Ao alternar as ramifica챌천es com `--merge` as altera챌천es que j찼 fora
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr "--conflict=<estilo>"
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 "O mesmo que a op챌찾o `--merge` acima, por챕m altera a maneira como os blocos conflitantes s찾o apresentados, ao substituir a vari찼vel de configura챌찾o `merge.conflictStyle`. Os valores poss챠veis s찾o `merge` (predefinido) e `diff3` (al챕m do que 챕 exibido atrav챕s do estilo \"merge\", exibe os conte첬dos originais)."
@@ -12867,7 +12878,7 @@ msgstr "Substitua silenciosamente os arquivos ignorados ao alternar ramifica챌천
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12879,13 +12890,13 @@ msgstr "O uso da op챌찾o `--recurse-submodules` atualizar찼 o conte첬do de todos
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12945,7 +12956,7 @@ msgstr "O nome do commit onde o ramo deve iniciar; para mais detalhes consulte l
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 "Como um caso especial, 챕 poss챠vel utilizar `\"A...B\"` como um atalho como uma base para a mesclagem de `A` e `B` caso exista exatamente uma base de merge. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso onde a predefini챌찾o retorna para `HEAD`."
@@ -13251,7 +13262,7 @@ msgstr "altern창ncia do ramo"
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr "tirar um arquivo de um outro commit"
@@ -13799,7 +13810,7 @@ msgstr "Caso um commit que esteja sendo escolhido seletivamente duplique um comm
#. 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr "--strategy=<estrat챕gia>"
@@ -14540,7 +14551,10 @@ msgid ""
"*NOTE*: this operation can race with concurrent modification to the\n"
"source repository, similar to running `cp -r src dst` while modifying\n"
"`src`.\n"
-msgstr "*OBSERVA횉횄O*: esta opera챌찾o pode competir com as altera챌천es concomitantes ao\nc처digo fonte no reposit처rio, semelhante ao executar `cp -r src dst` enquanto altera\no \"crc\".\n"
+msgstr ""
+"*OBSERVA횉횄O*: esta opera챌찾o pode competir com as altera챌천es concomitantes ao\n"
+"c처digo fonte no reposit처rio, semelhante ao executar `cp -r src dst` enquanto altera\n"
+"o \"crc\".\n"
#. type: Labeled list
#: en/git-clone.txt:65
@@ -16430,7 +16444,7 @@ msgstr "Para as op챌천es da leitura: leia somente no reposit처rio `.git/config`
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16838,7 +16852,7 @@ msgstr "Estas regras podem ser substitu챠das atrav챕s da linha de comando ou atr
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr "VARI횁VEIS DO AMBIENTE"
@@ -23773,7 +23787,10 @@ msgid ""
"Active Branch LRU\n"
"-----------------\n"
"active_branches = 1 cur, 5 max\n"
-msgstr "Ramo Ativo LRU\n-----------------\nactive_branches = 1 cur, 5 max\n"
+msgstr ""
+"Ramo Ativo LRU\n"
+"-----------------\n"
+"active_branches = 1 cur, 5 max\n"
#. type: delimited block =
#: en/git-fast-import.txt:1324
@@ -26596,7 +26613,30 @@ msgid ""
"\t\t [--progress]\n"
"\t\t [<common diff options>]\n"
"\t\t [ <since> | <revision range> ]\n"
-msgstr "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n\t\t [--no-thread | --thread[=<estilo>]]\n\t\t [(--attach|--inline)[=<limite>] | --no-attach]\n\t\t [-s | --signoff]\n\t\t [--signature=<assinatura> | --no-signature]\n\t\t [--signature-file=<arquivo>]\n\t\t [-n | --numbered | -N | --no-numbered]\n\t\t [--start-number <n>] [--numbered-files]\n\t\t [--in-reply-to=<id-da-mensagem>] [--suffix=.<sfx>]\n\t\t [--ignore-if-in-upstream]\n\t\t [--cover-from-description=<modo>]\n\t\t [--rfc] [--subject-prefix=<subject prefix>]\n\t\t [(--reroll-count|-v) <n>]\n\t\t [--to=<e-mail>] [--cc=<e-mail>]\n\t\t [--[no-]cover-letter] [--quiet]\n\t\t [--[no-]encode-email-headers]\n\t\t [--no-notes | --notes[=<ref>]]\n\t\t [--interdiff=<anterior>]\n\t\t [--range-diff=<anterior> [--creation-factor=<percentual>]]\n\t\t [--filename-max-length=<n>]\n\t\t [--progress]\n\t\t [<op챌천es-comuns-ao-diff>]\n\t\t [ <desde> | <faixa-da-revis찾o> ]\n"
+msgstr ""
+"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
+"\t\t [--no-thread | --thread[=<estilo>]]\n"
+"\t\t [(--attach|--inline)[=<limite>] | --no-attach]\n"
+"\t\t [-s | --signoff]\n"
+"\t\t [--signature=<assinatura> | --no-signature]\n"
+"\t\t [--signature-file=<arquivo>]\n"
+"\t\t [-n | --numbered | -N | --no-numbered]\n"
+"\t\t [--start-number <n>] [--numbered-files]\n"
+"\t\t [--in-reply-to=<id-da-mensagem>] [--suffix=.<sfx>]\n"
+"\t\t [--ignore-if-in-upstream]\n"
+"\t\t [--cover-from-description=<modo>]\n"
+"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n"
+"\t\t [(--reroll-count|-v) <n>]\n"
+"\t\t [--to=<e-mail>] [--cc=<e-mail>]\n"
+"\t\t [--[no-]cover-letter] [--quiet]\n"
+"\t\t [--[no-]encode-email-headers]\n"
+"\t\t [--no-notes | --notes[=<ref>]]\n"
+"\t\t [--interdiff=<anterior>]\n"
+"\t\t [--range-diff=<anterior> [--creation-factor=<percentual>]]\n"
+"\t\t [--filename-max-length=<n>]\n"
+"\t\t [--progress]\n"
+"\t\t [<op챌천es-comuns-ao-diff>]\n"
+"\t\t [ <desde> | <faixa-da-revis찾o> ]\n"
#. type: Plain text
#: en/git-format-patch.txt:43
@@ -30841,7 +30881,10 @@ msgid ""
"'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n"
"'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n"
"\t\t [--[no-]rev-index] [<pack-file>]\n"
-msgstr "'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n\t\t [--[no-]rev-index] [<pack-file>]\n"
+msgstr ""
+"'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n"
+"'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n"
+"\t\t [--[no-]rev-index] [<pack-file>]\n"
#. type: Plain text
#: en/git-index-pack.txt:24
@@ -32627,7 +32670,7 @@ msgstr "Consulte linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr "notes.displayRef"
@@ -32677,7 +32720,19 @@ msgid ""
"\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n"
"\t\t[--full-name] [--recurse-submodules]\n"
"\t\t[--abbrev[=<n>]] [--] [<file>...]\n"
-msgstr "'git ls-files' [-z] [-t] [-v] [-f]\n\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n\t\t(-[c|d|o|i|s|u|k|m])*\n\t\t[--eol]\n\t\t[--deduplicate]\n\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n\t\t[--exclude-per-directory=<arquivo>]\n\t\t[--exclude-standard]\n\t\t[--error-unmatch] [--with-tree=<찼rvore>]\n\t\t[--full-name] [--recurse-submodules]\n\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n"
+msgstr ""
+"'git ls-files' [-z] [-t] [-v] [-f]\n"
+"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n"
+"\t\t(-[c|d|o|i|s|u|k|m])*\n"
+"\t\t[--eol]\n"
+"\t\t[--deduplicate]\n"
+"\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n"
+"\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n"
+"\t\t[--exclude-per-directory=<arquivo>]\n"
+"\t\t[--exclude-standard]\n"
+"\t\t[--error-unmatch] [--with-tree=<찼rvore>]\n"
+"\t\t[--full-name] [--recurse-submodules]\n"
+"\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n"
#. type: Plain text
#: en/git-ls-files.txt:29
@@ -35237,7 +35292,9 @@ msgstr "Este comando 챕 o equivalente ao linkgit:git-hash-object[1] invocado com
msgid ""
" git mktag <my-tag\n"
" git hash-object -t tag -w --stdin <my-tag\n"
-msgstr " git mktag <minha-tag\n git hash-object -t tag -w --stdin <minha-tag\n"
+msgstr ""
+" git mktag <minha-tag\n"
+" git hash-object -t tag -w --stdin <minha-tag\n"
#. type: Plain text
#: en/git-mktag.txt:37
@@ -35283,7 +35340,11 @@ msgid ""
" type <typename>\n"
" tag <tagname>\n"
" tagger <tagger>\n"
-msgstr " object <hash>\n type <typename>\n tag <tagname>\n tagger <tagger>\n"
+msgstr ""
+" object <hash>\n"
+" type <typename>\n"
+" tag <tagname>\n"
+" tagger <tagger>\n"
#. type: Plain text
#: en/git-mktag.txt:63
@@ -35545,19 +35606,19 @@ msgstr "% git log | git name-rev --stdin\n"
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr "git-notes - Adiciona ou inspeciona as anota챌천es dos objeto"
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -35587,391 +35648,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr "Adiciona, remove ou l챗 as anota챌천es anexadas aos objetos, sem tocar nos pr처prios objetos."
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr "횋 predefinido que as anota챌천es sejam salvas e lidas do `refs/notes/commits`, mas esta predefini챌찾o pode ser substitu챠da. Consulte as se챌천es OP횉횛ES, CONFIGURA횉횄O e AMBIENTE abaixo. Caso esta refer챗ncia n찾o exista, ela ser찼 criada de forma silenciosa quando for necess찼rio armazenar uma nota pela primeira vez."
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr "Uma utiliza챌찾o t챠pica das anota챌천es 챕 complementar uma mensagem de um commit sem alterar o pr처prio commit. As anota챌천es podem ser exibidas com o comando 'git log' junto com a mensagem do commit original. Para distinguir entre estas anota챌천es da mensagem armazenada no commit do objeto, as anota챌천es s찾o recuadas como a mensagem, ap처s uma linha n찾o recolocada dizendo \"Notes (<refname>):\" (ou \"Notes:\" para `refs/notes/commits`) ."
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr "As anota챌천es tamb챕m podem ser adicionadas aos patches preparados com o comando `git format-patch` utilizando a op챌찾o `--notes`. Tais anota챌천es s찾o adicionadas como um coment찼rio de um patch ap처s uma linha separadora com tr챗s tra챌os."
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr "Para alterar quais as anota챌천es s찾o exibidas atrav챕s do comando 'git log', consulte a configura챌찾o \"notes.displayRef\" no linkgit:git-log[1]."
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr "Consulte a configura챌찾o \"notes.rewrite.<comando>\" para conhecer uma maneira de transportar as anota챌천es atrav챕s dos comandos que reescrevem os commits."
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr "SUBCOMANDOS"
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr "Liste as anota챌천es do objeto para um determinado objeto. Caso nenhum objeto seja informado, exiba uma lista com todas as anota챌천es dos objetos e os objetos que eles anotam (no formato \"<nota do objeto> <objeto anotado>\"). Este 챕 o subcomando predefinido caso nenhum subcomando seja utilizado."
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr "add"
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr "Adiciona anota챌천es para um determinado objeto (a predefini챌찾o retorna para `HEAD`). Interrompa caso o objeto j찼 tiver anota챌천es (utilize `-f` para substituir as anota챌천es j찼 existentes). No entanto, caso voc챗 esteja utilizando `add` de forma interativa (utilizando um editor para editar o conte첬do das notas), ent찾o - em vez de interromper - as anota챌천es j찼 existentes ser찾o abertas no editor (como o subcomando `edit`)."
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr "copy"
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr "Copie as anota챌천es para o primeiro objeto no segundo (a predefini챌찾o retorna para `HEAD`). Interrompa caso o segundo objeto j찼 tenha as anota챌천es ou caso o primeiro objeto n찾o tiver nenhuma (utilize '-f' para substituir as anota챌천es existentes no segundo objeto). Este subcomando se equivale a: `git notes add [-f] -C $(git notes list <do-objeto>) <para-o-objeto>`"
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr "No modo `--stdin`, pegue as linhas no formato"
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr "<do-objeto> SP <para-o-objeto> [ SP <rest> ] LF\n"
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr "na entrada padr찾o e copie as anota챌천es de cada <do-objeto> para o seu <para-o-objeto> correspondente. (O `<rest>` opcional 챕 ignorado para que o comando possa ler a entrada informada ao gancho `post-rewrite`.)"
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr "append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr "Anexe 횪s anota챌천es de um objeto j찼 existente (a predefini챌찾o retorna para `HEAD`). Cria uma nova anota챌찾o no objeto, caso seja necess찼rio."
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr "Edite as anota챌천es para um determinado objeto (a predefini챌찾o retorna para `HEAD`)."
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr "Mostrar as anota챌천es para um determinado objeto (a predefini챌찾o retorna para `HEAD`)."
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr "Mescle as anota챌천es \"ref\" informadas nas anota챌천es \"ref\" atuais. Ser찼 feita uma tentativa para mesclar as altera챌천es feitas atrav챕s das anota챌천es \"ref\" informada (chamadas \"remotas\") desde a base de mesclagem (caso haja) nas anota챌천es \"ref\" atuais (chamadas \"locais\")."
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr "Caso surjam conflitos e uma estrat챕gia para resolver automaticamente as notas conflitantes (consulte a se챌찾o \"OBSERVA횉횛ES SOBRE AS ESTRAT횋GIAS DA MESCLAGEM\") n찾o sejam utilizadas, o resolvedor \"manual\" ser찼 utilizado. Este resolvedor verifica se as notas conflitantes em uma 찼rvore de trabalho especial (`.git/NOTES_MERGE_WORKTREE`) instrui o usu찼rio a resolver manualmente os conflitos l찼. Quando for conclu챠do, o usu찼rio pode finalizar a mesclagem com o comando 'git notes merge --commit' ou interromper a mesclagem com o comando 'git notes merge --abort'."
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr "Remova as anota챌천es para determinados objetos (a predefini챌찾o retorna para `HEAD`). Ao atribuir zero ou um objeto a partir da linha de comando, isso equivale a informar uma mensagem com anota챌찾o vazia para o subcomando `edit`."
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr "Remova todas as anota챌천es dos objetos inexistentes/inacess챠veis."
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr "get-ref"
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr "Exiba as anota챌천es \"ref\" atuais. Fornece uma maneira f찼cil de recuperar as anota챌천es \"ref\" atuais (dos scripts por exemplo)."
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr "Ao adicionar as anota챌천es em um objeto que j찼 possa anota챌천es, substitua as anota챌천es existentes (em vez de abortar)."
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr "Utilize uma mensagem da anota챌찾o informada (em vez de solicitar). Caso v찼rias op챌천es `-m` seja informadas, os seus valores ser찾o concatenados como par찼grafos separados. Ser찾o removidas as linhas come챌ando com `#` e as linhas vazias que n찾o estejam em uma 첬nica linha entre os par찼grafos."
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr "Pegue a mensagem da anota챌찾o do arquivo informado. Utilize '-' para ler a mensagem da nota vindo da entrada padr찾o. Ser찾o removidas as linhas come챌ando com `#` e as linhas vazias que n찾o estejam em uma 첬nica linha entre os par찼grafos."
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr "-C <objeto>"
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr "--reuse-message=<objeto>"
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr "Tome o objeto bolha informada (outra nota por exemplo) como uma mensagem da nota. (Utiliza `git notes copy <objeto>` em vez da copia das notas entre os objetos.)"
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr "-c <objeto>"
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr "--reedit-message=<objeto>"
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr "Assim como '-C', por챕m com `-c` o editor 챕 invocado para que o usu찼rio possa editar mais a mensagem da nota."
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr "Permita que uma anota챌찾o vazia do objeto seja armazenado. O comportamento predefinido 챕 remover automaticamente as anota챌천es que estiverem vazias."
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr "--ref <ref>"
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr "Manipule as anota챌천es da 찼rvore na <ref>. Sobrescreve o `GIT_NOTES_REF` e a configura챌찾o \"core.notesRef\". A \"ref\" determina o nome completo quando come챌a com `refs/notes/`; quando come챌a com `notes/`, `refs/` e caso contr찼rio `refs/notes/` 챕 prefixado para formar um nome completo da \"ref\"."
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr "N찾o considere um erro ao solicitar a remo챌찾o das anota챌천es de um objeto que n찾o possua anota챌천es anexadas."
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr "Leia tamb챕m os nomes dos objetos para remover anota챌천es da entrada padr찾o (n찾o h찼 motivo para n찾o combinar isso com os nomes dos objetos na linha de comando)."
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr "N찾o remova nada; apenas relate os nomes dos objetos cujas anota챌천es seriam removidas."
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr "-s <estrat챕gia>"
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr "Ao mesclar as anota챌천es, resolva os conflitos das anota챌천es utilizando uma determinada estrat챕gia. As seguintes estrat챕gias s찾o reconhecidas: \"manual\" (predefinido), \"ours\" (nosso), \"theirs\" (deles), \"union\" (uni찾o) e \"cat_sort_uniq\". Esta op챌찾o substitui a configura챌찾o \"notes.mergeStrategy\". Consulte a se챌찾o \"OBSERVA횉횛ES SOBRE AS ESTRAT횋GIAS DA MESCLAGEM\" abaixo para obter mais informa챌천es sobre a estrat챕gia de mesclagem de cada nota."
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr "Finalize um 'git notes merge' em andamento. Utilize esta op챌찾o quando tiver resolvido os conflitos que o comando 'git notes merge' armazenou em `.git/NOTES_MERGE_WORKTREE`. Isso altera o commit parcial da mesclagem criado pelo comando 'git notes merge' (armazenado em `.git/NOTES_MERGE_PARTIAL`) adicionando as anota챌천es em `.git/NOTES_MERGE_WORKTREE`. As notas \"ref\" armazenadas no 'symref' `.git/NOTES_MERGE_REF` s찾o atualizadas no commit resultante."
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr "Interrompa/redefina um comando 'git notes merge' em andamento, ou seja, mesmo com conflitos, uma anota챌찾o ser찼 mesclada. Simplesmente remove todos os arquivos relacionados as anota챌천es da mesclagem."
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr "Quando mesclar as anota챌천es, opere em sil챗ncio."
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr "Quando mesclar as anota챌천es, seja loquaz. Quando remover as anota챌천es, relate todos os nomes dos objetos cujas notas foram removidas."
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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.]."
#. type: Plain text
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr "Cada modifica챌찾o nas anota챌천es cria um novo commit nas anota챌천es \"ref\" usadas. Portanto, voc챗 pode inspecionar o hist처rico das notas invocando por exemplo o comando `git log -p notes/commits`. Atualmente, a mensagem do commit registra apenas qual a opera챌찾o acionou a atualiza챌찾o, j찼 a autoria da confirma챌찾o 챕 determinada de acordo com as regras usuais (consulte linkgit:git-commit[1]). Estes detalhes podem mudar no futuro."
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr "Tamb챕m 챕 permitido que uma anota챌찾o da \"ref\" aponte diretamente para um objeto na 찼rvore, caso onde o hist처rico das anota챌천es podem ser lidos com `git log -p -g <refname>`."
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr "OBSERVA횉횛ES SOBRE AS ESTRAT횋GIAS DA MESCLAGEM"
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. Quando for conclu챠do, o usu찼rio pode finalizar a mesclagem com o comando 'git notes merge --commit' ou interromper a mesclagem com o comando 'git notes merge --abort'."
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr "Os usu찼rios podem selecionar uma estrat챕gia de mesclagem automatizada dentre as op챌천es a seguir, utilizando a op챌찾o `-s/--strategy` ou configurando a op챌찾o `notes.mergeStrategy` de acordo:"
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr "O \"ours\" (nosso) resolve automaticamente as anota챌천es conflitantes em favor da vers찾o local (ou seja, as anota챌천es \"ref\" atuais)."
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr "O \"deles\" resolve automaticamente os conflitos das anota챌천es em favor da vers찾o remota (ou seja, as anota챌천es dadas ao \"ref\" s찾o mescladas nas anota챌천es atuais da \"ref\")."
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr "O \"union\" resolve automaticamente os conflitos das anota챌천es concatenando as vers천es locais e remotas."
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr "O \"cat_sort_uniq\" 챕 semelhante ao \"union\", por챕m, al챕m de concatenar as vers천es locais e remotas, essa estrat챕gia tamb챕m classifica as linhas resultantes e remove as linhas que estiverem no resultado. Isso 챕 equivalente ao aplica챌찾o do pipeline shell \"cat | sort | uniq\" nas vers천es locais e remotos. Essa estrat챕gia 챕 첬til caso as notas sigam um formato com base nas linhas, onde se deseja evitar as linhas duplicadas no resultado da mesclagem. Observe que, caso a vers찾o local ou remota tiver linhas duplicadas antes da mesclagem, elas tamb챕m ser찾o removidas por esta anota챌찾o estrat챕gica de mesclagem."
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr "Voc챗 pode utilizar notas para adicionar anota챌천es com as informa챌찾o do que n찾o estava dispon챠vel no momento em que o commit foi feito."
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -35985,7 +36046,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -35995,13 +36056,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr "Em princ챠pio, uma anota챌찾o 챕 uma bolha Git comum e qualquer outro tipo de formato (n찾o) 챕 aceito. Voc챗 pode criar com seguran챌a as anota챌천es bin찼rias a partir de arquivos arbitr찼rios utilizando o comando 'git hash-object':"
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -36013,175 +36074,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr "(Voc챗 n찾o pode simplesmente utilizar o comando `git notes --ref=built add -F a.out HEAD` porque isso n찾o 챕 seguro para os arquivos bin찼rios.) 횋 claro que n찾o faz muito sentido exibir as anota챌천es que n찾o foram formatadas com 'git log', portanto, caso utilize estas anota챌천es, provavelmente precisar찼 escrever algumas ferramentas com um prop처sito especial para fazer algo 첬til com elas."
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr "Notas \"ref\" para ler e manipular em vez do `refs/notes/commits`. Deve ser um nome \"ref\" sem abrevia챌찾o. Esta configura챌찾o pode ser substitu챠da por uma vari찼vel de ambiente e atrav챕s da linha de comando."
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr "notes.mergeStrategy"
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr "Qual estrat챕gia predefinida de mesclagem escolher ao resolver os conflitos das anota챌천es. Deve ser uma das op챌천es `manual`, `ours` (nosso), `theirs` (deles), `union` (uni찾o) ou `cat_sort_uniq`. A predefini챌찾o retorna para `manual`. Consulte a se챌찾o \"OBSERVA횉횛ES SOBRE AS ESTRAT횋GIAS DA MESCLAGEM\" acima para obter mais informa챌천es sobre cada estrat챕gia."
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr "Esta configura챌찾o pode ser substitu챠da ao utilizar a op챌찾o `--strategy`."
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr "notes.<nome>.mergeStrategy"
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr "Qual estrat챕gia de mesclagem escolher ao fazer uma anota챌찾o na mesclagem em `refs/notes/<nome>`. Isso substitui a op챌찾o \"notes.mergeStrategy\" que 챕 mais gen챕rica. Consulte a se챌찾o \"OBSERVA횉횛ES SOBRE AS ESTRAT횋GIAS DA MESCLAGEM\" acima para obter mais informa챌천es sobre cada estrat챕gia dispon챠vel."
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr "Qual ref (ou refs, caso um \"glob\" seja especificado mais de uma vez), al챕m do padr찾o definido pela vari찼vel `core.notesRef` ou` GIT_NOTES_REF`, para ler as anota챌천es durante a exibi챌찾o das mensagens do commit junto com a fam챠lia de comandos 'git log'. Esta configura챌찾o pode ser substitu챠da na linha de comando ou pela vari찼vel de ambiente `GIT_NOTES_DISPLAY_REF`. Consulte linkgit:git-log[1]."
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr "notes.rewrite.<comando>"
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr "Ao reescrever os commits com o <comando> (atualmente `ammend` ou `rebase`), caso esta vari찼vel seja `false`, o git n찾o copiar찼 as anota챌천es do original para o commit que foi reescrito. A predefini챌찾o retorna para `true`. Consulte tamb챕m \"`notes.rewriteRef`\" abaixo."
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr "Esta configura챌찾o pode ser substitu챠da pela vari찼vel de ambiente `GIT_NOTES_REWRITE_REF`."
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr "notes.rewriteMode"
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr "Ao copiar as anota챌천es durante uma reescrita, o que fazer caso o commit de destino j찼 tiver uma anota챌찾o. Deve ser uma das op챌찾o `overwrite`,` concatenate`, `cat_sort_uniq` ou` ignore`. A predefini챌찾o retorna para `concatenate`."
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr "Esta configura챌찾o pode ser substitu챠da pela vari찼vel de ambiente `GIT_NOTES_REWRITE_MODE`."
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr "notes.rewriteRef"
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr "Ao copiar as anota챌천es durante uma reescrita, defina a \"ref\" (totalmente qualificada) cujas anota챌천es devem ser copiadas. Pode ser um agrupamento \"glob\", onde as anota챌천es em todas as refer챗ncias coincidentes ser찾o copiadas. 횋 poss챠vel tamb챕m utilizar esta configura챌찾o v찼rias vezes."
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr "N찾o possui um valor predefinido; voc챗 deve configurar esta vari찼vel para ativar a reescrita das anota챌천es."
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr "Pode ser substitu챠do pela vari찼vel de ambiente `GIT_NOTES_REWRITE_REF`."
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr "De qual \"ref\" manipular as anota챌천es, em vez do `refs/notes/commits`. Sobrescreve a configura챌찾o `core.notesRef`."
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr "Uma lista delimitada por dois pontos das refs ou \"globs\" indicando quais as refs, al챕m da predefini챌찾o do `core.notesRef` ou` GIT_NOTES_REF`, para ler as anota챌천es ao exibir as mensagens dos commits. Sobrescreve a configura챌찾o `notes.displayRef`."
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
msgstr "Um aviso ser찼 emitido para as refs que n찾o existam, por챕m um agrupamento \"glob\" que n찾o corresponda a nenhuma refer챗ncia 챕 ignorada em sil챗ncio."
#. type: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr "Ao copiar as anota챌천es durante uma reescrita, o que fazer caso o commit de destino j찼 tiver uma anota챌찾o. Deve ser uma das op챌찾o `overwrite`,` concatenate`, `cat_sort_uniq` ou` ignore`. Sobrescreve a configura챌찾o `core.rewriteMode`."
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr "Ao reescrever os commits, as anota챌천es que ser찾o copiadas do original para o commit que ser찼 reescrito. Deve ser uma lista delimitada por dois pontos das refs ou globs."
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr "Caso n찾o esteja definido no ambiente, a lista das anota챌천es que ser찾o copiadas ir찼 depender das configura챌천es `notes.rewrite.<comando>` e `notes.rewriteRef`."
@@ -40077,7 +40138,11 @@ msgid ""
"\t[--no-dual-color] [--creation-factor=<factor>]\n"
"\t[--left-only | --right-only]\n"
"\t( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n"
-msgstr "'git range-diff' [--color=[<quando>]] [--no-color] [<diff-options>]\n\t[--no-dual-color] [--creation-factor=<fator>]\n\t[--left-only | --right-only]\n\t( <intervalo1> <intervalo2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n"
+msgstr ""
+"'git range-diff' [--color=[<quando>]] [--no-color] [<diff-options>]\n"
+"\t[--no-dual-color] [--creation-factor=<fator>]\n"
+"\t[--left-only | --right-only]\n"
+"\t( <intervalo1> <intervalo2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n"
#. type: Plain text
#: en/git-range-diff.txt:21
@@ -40280,7 +40345,12 @@ msgid ""
"2: f00dbal ! 3: decafe1 Describe a bug\n"
" @@ -1,3 +1,3 @@\n"
" Author: A U Thor <author@example.com>\n"
-msgstr "-: ------- > 1: 0ddba11 Se prepare para o inevit찼vel!\n1: c0debee = 2: cab005e Adicione uma mensagem de ajuda no in챠cio\n2: f00dbal ! 3: decafe1 Descreva o problema\n @@ -1,3 +1,3 @@\n Autor: A U Thor <author@example.com>\n"
+msgstr ""
+"-: ------- > 1: 0ddba11 Se prepare para o inevit찼vel!\n"
+"1: c0debee = 2: cab005e Adicione uma mensagem de ajuda no in챠cio\n"
+"2: f00dbal ! 3: decafe1 Descreva o problema\n"
+" @@ -1,3 +1,3 @@\n"
+" Autor: A U Thor <author@example.com>\n"
#. type: delimited block -
#: en/git-range-diff.txt:154
@@ -40290,7 +40360,11 @@ msgid ""
" +Describe a bug\n"
" @@ -324,5 +324,6\n"
" This is expected.\n"
-msgstr " -TODO: Descreva um problema\n +Descreva um problema\n @@ -324,5 +324,6\n J찼 era esperado.\n"
+msgstr ""
+" -TODO: Descreva um problema\n"
+" +Descreva um problema\n"
+" @@ -324,5 +324,6\n"
+" J찼 era esperado.\n"
#. type: delimited block -
#: en/git-range-diff.txt:158
@@ -40299,7 +40373,10 @@ msgid ""
" -+What is unexpected is that it will also crash.\n"
" ++Unexpectedly, it also crashes. This is a bug, and the jury is\n"
" ++still out there how to fix it best. See ticket #314 for details.\n"
-msgstr " -+O que 챕 inesperado 챕 que tamb챕m ir찼 travar.\n ++Inesperadamente, ele tamb챕m trava. Este 챕 um bug, e o j첬ri 챕\n ++ainda est찼 no ar a maneira de como melhor consertar. Consulte o t챠quete #314 para obter mais detalhes.\n"
+msgstr ""
+" -+O que 챕 inesperado 챕 que tamb챕m ir찼 travar.\n"
+" ++Inesperadamente, ele tamb챕m trava. Este 챕 um bug, e o j첬ri 챕\n"
+" ++ainda est찼 no ar a maneira de como melhor consertar. Consulte o t챠quete #314 para obter mais detalhes.\n"
#. type: delimited block -
#: en/git-range-diff.txt:161
@@ -40307,7 +40384,9 @@ msgstr " -+O que 챕 inesperado 챕 que tamb챕m ir찼 travar.\n ++Inesperadam
msgid ""
" Contact\n"
"3: bedead < -: ------- TO-UNDO\n"
-msgstr " Contato\n3: bedhead <-: ------- PARA DESFAZER\n"
+msgstr ""
+" Contato\n"
+"3: bedhead <-: ------- PARA DESFAZER\n"
#. type: Plain text
#: en/git-range-diff.txt:166
@@ -40394,7 +40473,10 @@ msgid ""
" 1 A\n"
"\t /\n"
" 2 --------' B\n"
-msgstr " 1 A\n\t /\n 2 --------' B\n"
+msgstr ""
+" 1 A\n"
+"\t /\n"
+" 2 --------' B\n"
#. type: Plain text
#: en/git-range-diff.txt:229
@@ -40412,7 +40494,13 @@ msgid ""
"\t |\n"
"\t `----- C\n"
"\t c>0\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+"\t |\n"
+"\t `----- C\n"
+"\t c>0\n"
#. type: Plain text
#: en/git-range-diff.txt:245
@@ -40431,7 +40519,14 @@ msgid ""
" o `----- C\n"
"\t c>0\n"
" o o\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+"\t |\n"
+" o `----- C\n"
+"\t c>0\n"
+" o o\n"
#. type: delimited block -
#: en/git-range-diff.txt:256
@@ -40462,7 +40557,14 @@ msgid ""
" o -' `----- C\n"
"\t c>0\n"
" o ---------- o\n"
-msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n"
+msgstr ""
+" 1 ----. A\n"
+"\t | /\n"
+" 2 ----+---' B\n"
+" .--+-----'\n"
+" o -' `----- C\n"
+"\t c>0\n"
+" o ---------- o\n"
#. type: delimited block -
#: en/git-range-diff.txt:284
@@ -46362,19 +46464,19 @@ msgstr "O `X` significa qualquer condi챌찾o e `U` significa um 챠ndice n찾o mesc
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr "git-restore - Restaura os arquivos das 찼rvores de trabalho"
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -46386,145 +46488,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr "Restaure os caminhos definidos na 찼rvore de trabalho com algum conte첬do de uma fonte de restaura챌찾o. Se um caminho for monitorado, por챕m n찾o existir na fonte de restaura챌찾o, ele ser찼 removido para coincidir com a fonte."
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr "O comando tamb챕m pode ser usado para restaurar o conte첬do no 챠ndice com a op챌찾o `--staged`, ou para restaurar a 찼rvore de trabalho e o 챠ndice com `--staged --worktree`."
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr "횋 predefinido que caso `--staged` seja utilizado, o conte첬do ser찼 restaurado a partir do `HEAD`, caso contr찼rio, a partir do 챠ndice. Utilize a op챌찾o `--source` para restaurar a partir de um commit diferente."
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr "ESTE COMANDO 횋 EXPERIMENTAL. O SEU COMPORTAMENTO PODE MUDAR."
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr "-s <찼rvore>"
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr "--source=<찼rvore>"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr "Restaure arquivos da 찼rvore de trabalho com o conte첬do da 찼rvore informada. 횋 comum especificar a 찼rvore de origem nomeando um commit, ramo ou tag associado com ela."
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr "Caso n찾o seja definido, o conte첬do ser찼 restaurado a partir de `HEAD` caso `--staged` seja informado, caso contr찼rio, a restaura챌찾o ser찼 a partir do 챠ndice."
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr "Selecione a diferen챌a entre os blocos interativamente entre a origem da restaura챌찾o e o local da restaura챌찾o. Consulte a se챌찾o ``Modo Interativo'' do linkgit:git-add[1] para aprender como operar o modo `--patch`."
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr "Note que o comando `--patch` pode n찾o aceitar nenhum `pathspec` e solicitar찼 a restaura챌찾o de todos os caminhos modificados."
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr "-S"
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr "Especifica o local da restaura챌찾o. 횋 predefinido que caso nenhuma op챌찾o seja utilizada a 찼rvore de trabalho ser찼 restaurada. Ao usar a op챌찾o `--staged` apenas a 챠ndice ser찼 restaurado. A utiliza챌찾o de ambas as op챌천es faz a restaura챌찾o de ambos."
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr "Silencioso, suprima as mensagens de feedback. Implies `--no-progress`."
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr "Ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho, utilize o est찼gio #2 ('nosso') ou #3 ('deles') para os caminhos que n찾o foram mesclados."
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr "Note que durante o `git rebase` e o `git pull --rebase`, o 'nosso' e o 'deles' podem aparecer trocados. Para mais detalhes, consulte a explica챌찾o das mesmas op챌천es em linkgit:git-checkout[1]."
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr "Ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho, recrie a mesclagem conflitante nos caminhos que ainda n찾o foram mesclados."
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr "N찾o aborte a opera챌찾o ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho caso existam entradas que n찾o foram mescladas e t찾o pouco as op챌천es `--ours`, `--theirs`, `--merge` ou `--conflict` tenham sido utilizadas. Nada acontece com os caminhos das 찼rvores de trabalho caso eles n찾o tenham sido mesclados."
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr "횋 predefinido que no modo de averigua챌찾o esparsa, apenas atualize as entradas que coincidam com `<pathspec>` e os padr천es esparsos no `$GIT_DIR/info/sparse-checkout`. Esta op챌찾o ignora os padr천es esparsos e restaura incondicionalmente todos os arquivos que estejam no `<pathspec>`."
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr "Caso o `<pathspec>` nomeie um subm처dulo ativo e o local da restaura챌찾o incluir a 찼rvore de trabalho, o subm처dulo ser찼 atualizado apenas caso esta op챌찾o seja utilizada. Neste caso, a sua 찼rvore de trabalho ser찼 restaurada para o commit registrado no superprojeto e quaisquer altera챌천es locais ser찾o substitu챠das. Caso nada (ou a op챌찾o `--no-recurse-submodules`) seja utilizado, os subm처dulos que trabalham nas 찼rvores n찾o ser찾o atualizados. Assim como linkgit:git-submodule[1], isso faz com que o `HEAD` seja desanexando do subm처dulo."
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr "No modo de sobreposi챌찾o, o comando nunca remove os arquivos durante a restaura챌찾o. No modo sem sobreposi챌찾o, os arquivos rastreados que n찾o aparecem na 찼rvore `--source` s찾o removidos para faz챗-los coincidir exatamente com a `<찼rvore>`. A predefini챌찾o 챕 sem sobreposi챌찾o."
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr "A sequ챗ncia a seguir muda para o ramo `master`, reverte o` Makefile` para duas revis천es anteriores, apaga o hello.c por engano e o recupera do 챠ndice."
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -46538,91 +46640,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr "restaurar o hello.c do 챠ndice"
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr "Caso queira restaurar _TODOS_ os arquivos do c처digo fonte C para que coincidam com a vers찾o do 챠ndice, voc챗 pode usar"
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr "Observe as aspas em torno de `* .c`. O arquivo `hello.c` tamb챕m ser찼 restaurado ainda que n찾o esteja mais na 찼rvore de trabalho, pois o agrupamento dos arquivos 챕 utilizado para coincidir com as entradas do 챠ndice (n찾o na 찼rvore de trabalho pelo shell)."
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr "Para restaurar todos os arquivos no diret처rio atual"
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr "ou para restaurar todos os arquivos do cume da 찼rvore de trabalho com a m찼gica do \"pathspec\" (consulte linkgit:gitglossary[7])"
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr "Para restaurar um arquivo no 챠ndice que coincida com a vers찾o em `HEAD` (챕 o mesmo que usar linkgit:git-reset[1])"
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr "ou voc챗 pode restaurar o 챠ndice e a 찼rvore de trabalho (챕 o mesmo que usar linkgit:git-checkout[1])"
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr "$ git restore --source=HEAD --staged --worktree hello.c\n"
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr "ou a forma abreviada que 챕 mais pr찼tica, mas menos leg챠vel:"
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -46804,7 +46906,9 @@ msgstr "Formate os commits junto com os seus diffs (consulte tamb챕m a porcelana
msgid ""
"git rev-list HEAD |\n"
"git diff-tree --stdin --format=medium -p\n"
-msgstr "git rev-list HEAD |\ngit diff-tree --stdin --format=medium -p\n"
+msgstr ""
+"git rev-list HEAD |\n"
+"git diff-tree --stdin --format=medium -p\n"
#. type: Plain text
#: en/git-rev-list.txt:67
@@ -46860,7 +46964,15 @@ msgid ""
"du -c .git/objects/pack/*.pack .git/objects/??/*\n"
"# alternative to du: add up \"size\" and \"size-pack\" fields\n"
"git count-objects -v\n"
-msgstr "# objetos acess챠veis\ngit rev-list --disk-usage --objects --all\n# mais os reflogs\ngit rev-list --disk-usage --objects --all --reflog\n# tamanho total da utiliza챌찾o do disco\ndu -c .git/objects/pack/*.pack .git/objects/??/*\n# 챕 uma alternativa para du: add up \"size\" e os campos \"size-pack\"\ngit count-objects -v\n"
+msgstr ""
+"# objetos acess챠veis\n"
+"git rev-list --disk-usage --objects --all\n"
+"# mais os reflogs\n"
+"git rev-list --disk-usage --objects --all --reflog\n"
+"# tamanho total da utiliza챌찾o do disco\n"
+"du -c .git/objects/pack/*.pack .git/objects/??/*\n"
+"# 챕 uma alternativa para du: add up \"size\" e os campos \"size-pack\"\n"
+"git count-objects -v\n"
#. type: Plain text
#: en/git-rev-list.txt:107
@@ -46879,7 +46991,14 @@ msgid ""
"\techo \"$size $branch\"\n"
"done |\n"
"sort -n\n"
-msgstr "git for-each-ref --format='%(refname)' |\nwhile read branch\ndo\n\tsize=$(git rev-list --disk-usage --objects HEAD..$branch)\n\techo \"$size $branch\"\ndone |\nsort -n\n"
+msgstr ""
+"git for-each-ref --format='%(refname)' |\n"
+"while read branch\n"
+"do\n"
+"\tsize=$(git rev-list --disk-usage --objects HEAD..$branch)\n"
+"\techo \"$size $branch\"\n"
+"done |\n"
+"sort -n\n"
#. type: Plain text
#: en/git-rev-list.txt:122
@@ -50443,139 +50562,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr "git-show - Exibe v찼rios tipos de objetos"
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<op챌천es>] [<objeto>...]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr "Exibe um ou mais objetos (bolhas, 찼rvores, tags e commits)."
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr "Para commits, exibe a mensagem do registro log e a diferen챌a textual. Ele tamb챕m apresenta o commit de mesclagem em um formato especial, produzido por 'git diff-tree --cc'."
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr "Para tags, ele exibe a mensagem da tag e os objetos referenciados."
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr "Para 찼rvores, ele exibe os nomes (equivalente a `git ls-tree` com `--name-only`)."
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr "Para bolhas simples, exibe o conte첬do simples."
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr "O comando aceita as op챌천es aplic찼veis ao comando `git diff-tree` para controlar como as modifica챌천es feitas pelo commit s찾o exibidas."
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr "Esta p찼gina do manual descreve apenas as op챌천es utilizadas com mais frequ챗ncia."
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr "<objeto>..."
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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 "Os nomes dos objetos a serem exibidos (a predefini챌찾o retorna para 'HEAD'). Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
#. type: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr "As op챌천es abaixo podem ser usadas para alterar a maneira como o comando `git show` gera o diff."
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr "`git show v1.0.0`"
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr "Exibe a tag `v1.0.0` junto com o objeto que as tags apontarem."
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr "`git show v1.0.0^{tree}`"
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr "Exibe a 찼rvore apontada pela tag `v1.0.0`."
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr "`git show -s --format=%s v1.0.0^{commit}`"
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr "Exiba o assunto do commit apontado pela tag `v1.0.0`."
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr "`git show next~10:Documentation/README`"
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr "Exibe o conte첬do do arquivo `Documentation/README` como eles estavam atualmente no d챕cimo 첬ltimo commit do ramo `next`."
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr "`git show master:Makefile master:t/Makefile`"
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr "Concatena o conte첬do dos referidos Makefiles no `HEAD` do ramo `master`."
@@ -50805,7 +50924,19 @@ msgid ""
"'git stash' clear\n"
"'git stash' create [<message>]\n"
"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
-msgstr "'git stash' list [<op챌천es-do-log>]\n'git stash' show [<op챌천es-do-diff] [<stash>]\n'git stash' drop [-q|--quiet] [<stash>]\n'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n'git stash' branch <nome-do-ramo> [<stash>]\n'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n\t [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n\t [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n\t [--] [<pathspec>...]]\n'git stash' clear\n'git stash' create [<mensagem>]\n'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n"
+msgstr ""
+"'git stash' list [<op챌천es-do-log>]\n"
+"'git stash' show [<op챌천es-do-diff] [<stash>]\n"
+"'git stash' drop [-q|--quiet] [<stash>]\n"
+"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n"
+"'git stash' branch <nome-do-ramo> [<stash>]\n"
+"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"\t [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n"
+"\t [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]]\n"
+"'git stash' clear\n"
+"'git stash' create [<mensagem>]\n"
+"'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n"
#. type: Plain text
#: en/git-stash.txt:31
@@ -55889,7 +56020,13 @@ msgid ""
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--super-prefix=<path>] [--config-env <name>=<envvar>]\n"
" <command> [<args>]\n"
-msgstr "'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n [--super-prefix=<caminho>][--config-env <nome>=<envvar>]\n <comando> [<args>]\n"
+msgstr ""
+"'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n"
+" [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n"
+" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n"
+" [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n"
+" [--super-prefix=<caminho>][--config-env <nome>=<envvar>]\n"
+" <comando> [<args>]\n"
#. type: Plain text
#: en/git.txt:24
@@ -60335,7 +60472,11 @@ msgid ""
"/path/to/linked-worktree abcd1234 [master]\n"
"/path/to/locked-worktreee acbd5678 (brancha) locked\n"
"/path/to/prunable-worktree 5678abc (detached HEAD) prunable\n"
-msgstr "$ git worktree list\n/path/to/linked-worktree abcd1234 [master]\n/path/to/locked-worktreee acbd5678 (brancha) bloqueado\n/path/to/prunable-worktree 5678abc (HEAD desanexada) pod찼vel\n"
+msgstr ""
+"$ git worktree list\n"
+"/path/to/linked-worktree abcd1234 [master]\n"
+"/path/to/locked-worktreee acbd5678 (brancha) bloqueado\n"
+"/path/to/prunable-worktree 5678abc (HEAD desanexada) pod찼vel\n"
#. type: Plain text
#: en/git-worktree.txt:397
@@ -60354,7 +60495,14 @@ msgid ""
"\tlocked: working tree path is mounted on a portable device\n"
"/path/to/prunable-worktree 5678abc1 (detached HEAD)\n"
"\tprunable: gitdir file points to non-existent location\n"
-msgstr "$ git worktree list --verbose\n/path/to/linked-worktree abcd1234 [master]\n/path/to/locked-worktree-no-reason abcd5678 (HEAD desanexado) bloqueado\n/path/to/locked-worktree-with-reason 1234abcd (brancha)\n\tbloqueado: a 찼rvore de trabalho est찼 montando em um dispositivo port찼til\n/path/to/prunable-worktree 5678abc1 (HEAD desanexado)\n\tpod찼vel: o arquivo gitdir aponta para um local que n찾o existe\n"
+msgstr ""
+"$ git worktree list --verbose\n"
+"/path/to/linked-worktree abcd1234 [master]\n"
+"/path/to/locked-worktree-no-reason abcd5678 (HEAD desanexado) bloqueado\n"
+"/path/to/locked-worktree-with-reason 1234abcd (brancha)\n"
+"\tbloqueado: a 찼rvore de trabalho est찼 montando em um dispositivo port찼til\n"
+"/path/to/prunable-worktree 5678abc1 (HEAD desanexado)\n"
+"\tpod찼vel: o arquivo gitdir aponta para um local que n찾o existe\n"
#. type: Plain text
#: en/git-worktree.txt:411
@@ -60418,7 +60566,11 @@ msgid ""
"HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n"
"branch refs/heads/locked-no-reason\n"
"locked\n"
-msgstr "worktree /path/to/linked-worktree-locked-no-reason\nHEAD 5678abc5678abc5678abc5678abc5678abc5678c\nbranch refs/heads/locked-no-reason\nlocked\n"
+msgstr ""
+"worktree /path/to/linked-worktree-locked-no-reason\n"
+"HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n"
+"branch refs/heads/locked-no-reason\n"
+"locked\n"
#. type: delimited block -
#: en/git-worktree.txt:444
@@ -60428,7 +60580,11 @@ msgid ""
"HEAD 3456def3456def3456def3456def3456def3456b\n"
"branch refs/heads/locked-with-reason\n"
"locked reason why is locked\n"
-msgstr "worktree /path/to/linked-worktree-locked-with-reason\nHEAD 3456def3456def3456def3456def3456def3456b\nbranch refs/heads/locked-with-reason\nlocked reason why is locked\n"
+msgstr ""
+"worktree /path/to/linked-worktree-locked-with-reason\n"
+"HEAD 3456def3456def3456def3456def3456def3456b\n"
+"branch refs/heads/locked-with-reason\n"
+"locked reason why is locked\n"
#. type: delimited block -
#: en/git-worktree.txt:449
@@ -60438,7 +60594,11 @@ msgid ""
"HEAD 1233def1234def1234def1234def1234def1234b\n"
"detached\n"
"prunable gitdir file points to non-existent location\n"
-msgstr "worktree /path/to/linked-worktree-prunable\nHEAD 1233def1234def1234def1234def1234def1234b\ndetached\nprunable gitdir file points to non-existent location\n"
+msgstr ""
+"worktree /path/to/linked-worktree-prunable\n"
+"HEAD 1233def1234def1234def1234def1234def1234b\n"
+"detached\n"
+"prunable gitdir file points to non-existent location\n"
#. type: Plain text
#: en/git-worktree.txt:456
@@ -60454,7 +60614,11 @@ msgid ""
"...\n"
"locked \"reason\\nwhy is locked\"\n"
"...\n"
-msgstr "$ git worktree list --porcelain\n...\nlocked \"reason\\nwhy is locked\"\n...\n"
+msgstr ""
+"$ git worktree list --porcelain\n"
+"...\n"
+"locked \"reason\\nwhy is locked\"\n"
+"...\n"
#. type: Plain text
#: en/git-worktree.txt:474
@@ -61924,19 +62088,19 @@ msgstr "Caso `:<funcname>` seja informado no lugar do '<inicio>' e '<fim>', 챕 u
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr "-L<inicio>,<fim>:<arquivo>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr "-L:<nome-da-fun챌찾o>:<arquivo>"
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 "Trace a evolu챌찾o do intervalo da linha informado atrav챕s de '<in챠cio>,<fim>' ou pelo nome da fun챌찾o regex '<funcname>', dentro do '<arquivo>'. Voc챗 n찾o pode fornecer nenhum limitador ao pathspec. Isso est찼 atualmente limitado a um passo come챌ando a partir de uma 첬nica revis찾o, ou seja, voc챗 s처 pode dar zero ou um argumento positivo de revis찾o, assim como '<in챠cio>' e '<fim>' (ou '<funcname>') devem existir no come챌o da revis찾o. Voc챗 pode usar esta op챌찾o mais de uma vez. Implica no uso da op챌찾o `--patch` A sa챠da do patch pode ser suprimida usando `--no-patch`, mas outros formatos diff (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) ainda n찾o est찾o implementados."
@@ -62392,205 +62556,205 @@ msgstr "Com as estrat챕gias que usma a mesclagem de 3 vias (incluindo a predefin
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:240
+#, priority:100
msgid "bc4"
msgstr "bc4"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:240
+#, priority:100
msgid "gvimdiff1"
msgstr "gvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:240
+#, priority:100
msgid "nvimdiff1"
msgstr "nvimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:240
+#, priority:100
msgid "vimdiff1"
msgstr "vimdiff1"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr "ESTA OP횉횄O 횋 EXPERIMENTAL! O suporte ao SHA-256 챕 experimental e ainda est찼 em um est찼gio inicial. Um reposit처rio SHA-256 em geral n찾o ser찼 capaz de compartilhar trabalho com reposit처rios SHA-1 \"normais\". Deve-se presumir que, os formatos do arquivo interno Git em rela챌찾o aos reposit처rios SHA-256 podem mudar de maneira que se tornem incompat챠veis com as vers천es anteriores por exemplo. Use apenas `--object-format=sha256` apenas como teste."
@@ -64068,13 +64232,13 @@ msgstr "H찼 uma diferen챌a entre listar m첬ltiplos <refspec> diretamente na linh
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr "Ao combinar diversos filtros a op챌찾o `--contains` e a op챌찾o `--no-contains`, faz refer챗ncias apenas aos que contenha pelo menos um dos commits `--contains` e n찾o contenha nenhum dos commits mostrados com `--no-contains`."
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr "Ao combinar diversos filtros a op챌찾o `--merged` e a op챌찾o `--no-merged`, faz refer챗ncias apenas aos que sejam acess챠veis a partir um dos commits `--merged` e de nenhum dos commits mostrados com `--no-merged`."
@@ -64742,83 +64906,91 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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 "Liste os commits que podem ser acessadas seguindo os links `parent` de determinados commits, por챕m exclua os commits acess챠veis das que receberam um '{caret}' na frente deles. Por predefini챌찾o, a sa챠da 챕 informada em ordem cronol처gica reversa."
#. type: Plain text
#: en/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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 "Voc챗 pode pensar nisso como uma opera챌찾o conjunta. Os commits acess챠veis a partir de qualquer um dos commits passados na linha de comando formam um conjunto e ent찾o os commits acess챠veis a partir de qualquer um dos passados com '{caret}' na frente, s찾o subtra챠dos desse conjunto. Os commits restantes s찾o os que saem do comando. V찼rias outras op챌천es e par창metros dos caminhos podem ser usados para limitar ainda mais o resultado."
#. type: Plain text
#: en/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr "Assim, o seguinte comando:"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git rev-list foo bar ^baz\n"
msgstr "$ git rev-list foo bar ^baz\n"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr "$ git log foo bar ^baz\n"
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr "significa \"listar todos os commits acess챠veis a partir do 'foo' ou 'bar', por챕m n찾o de 'baz'\"."
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr "Uma nota챌찾o especial \"'<commit1>'..'<commit2>'\" pode ser usada como uma abrevia챌찾o para \"^'<commit1>' '<commit2>'\". Por exemplo, qualquer um dos seguintes podem ser usados de forma intercambi찼vel:"
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
-msgstr "$ git rev-list origin..HEAD\n$ git rev-list HEAD ^origin\n"
+msgstr ""
+"$ git rev-list origin..HEAD\n"
+"$ git rev-list HEAD ^origin\n"
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
-msgstr "$ git log origin..HEAD\n$ git log HEAD ^origin\n"
+msgstr ""
+"$ git log origin..HEAD\n"
+"$ git log HEAD ^origin\n"
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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 "Outra nota챌찾o especial 챕 \"'<commit1>'...'<commit2>'\", 첬til para mesclagens. O conjunto resultante dos commits 챕 a diferen챌a sim챕trica entre dois operandos. Os dois comandos a seguir s찾o equivalentes:"
#. type: delimited block -
#: en/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
-msgstr "$ git rev-list A B --not $(git merge-base --all A B)\n$ git rev-list A...B\n"
+msgstr ""
+"$ git rev-list A B --not $(git merge-base --all A B)\n"
+"$ git rev-list A...B\n"
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
-msgstr "$ git log A B --not $(git merge-base --all A B)\n$ git log A...B\n"
+msgstr ""
+"$ git log A B --not $(git merge-base --all A B)\n"
+"$ git log A...B\n"
#. type: Title ~
#: en/rev-list-options.txt:2
@@ -66752,19 +66924,19 @@ msgstr "Cancele a opera챌찾o e retorne a condi챌찾o pr챕-sequ챗ncia."
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr "Adicione uma resposta `Assinado-por` por quem fez o commit no final da mensagem de log do commit. O significado de uma assinatura na sa챠da da mensagem depende do projeto onde voc챗 est찼 fazendo o commit. Por exemplo, ele pode certificar que o autor do commit tem o direito de enviar o trabalho sob a licen챌a do projeto ou concorda com alguma representa챌찾o de quem est찼 contribuindo, como um Certificado de Origem do Desenvolvedor. (Consulte o http://developercertificate.org para conhecer aquele usado pelo kernel Linux e dos projetos Git.) Consulte a documenta챌찾o ou lideran챌a do projeto onde voc챗 est찼 contribuindo para entender como as aprova챌천es s찾o usadas naquele projeto."
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr "A op챌찾o --no-signoff pode ser usada para contra-ordenar uma op챌찾o --signoff anterior na linha de comando."
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 5740833..01e0b15 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -3551,55 +3551,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3616,43 +3616,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3664,25 +3664,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3695,7 +3695,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3710,7 +3710,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3725,37 +3725,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3765,85 +3765,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -5998,7 +5998,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6010,7 +6010,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6971,7 +6971,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7043,7 +7043,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7321,7 +7321,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8140,7 +8140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9645,19 +9645,19 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9678,181 +9678,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9870,313 +9870,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10186,19 +10186,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10208,25 +10208,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10234,67 +10234,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11387,7 +11387,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12248,13 +12248,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12272,13 +12272,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12428,7 +12428,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12470,13 +12470,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12530,7 +12530,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12542,13 +12542,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12608,7 +12608,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12857,7 +12857,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13386,7 +13386,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15877,7 +15877,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16285,7 +16285,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31388,7 +31388,7 @@ msgstr "linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34174,19 +34174,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34204,391 +34204,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:280
msgid "merge"
msgstr "emerge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34598,7 +34598,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34606,13 +34606,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34621,175 +34621,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44495,19 +44495,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44516,145 +44516,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44664,91 +44664,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48439,139 +48439,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59502,19 +59502,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59970,212 +59970,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61633,13 +61633,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62258,50 +62258,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62309,7 +62309,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62317,13 +62317,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62331,7 +62331,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64201,19 +64201,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index e23db46..d6daea8 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -2,7 +2,19 @@
# Copyright (C) 2019
# This file is distributed under the same license as the Git package.
msgid ""
-msgstr "Project-Id-Version: Git Documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-03-08 22:02+0000\nLast-Translator: Artem Buslov <buslov.artem@gmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: ru\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-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;\nX-Generator: Weblate 4.5.1\n"
+msgstr ""
+"Project-Id-Version: Git Documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-02-27 18:16+0100\n"
+"PO-Revision-Date: 2021-03-08 22:02+0000\n"
+"Last-Translator: Artem Buslov <buslov.artem@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-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.5.1\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:738 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
@@ -3543,55 +3555,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3608,43 +3620,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3656,25 +3668,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3687,7 +3699,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3702,7 +3714,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3717,37 +3729,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3757,85 +3769,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -5992,7 +6004,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6004,7 +6016,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6614,7 +6626,11 @@ msgid ""
" 1: status 2: update 3: revert 4: add untracked\n"
" 5: patch 6: diff 7: quit 8: help\n"
" What now> 1\n"
-msgstr " *** Commands ***\n 1: status 2: update 3: revert 4: add untracked\n 5: patch 6: diff 7: quit 8: help\n What now> 1\n"
+msgstr ""
+" *** Commands ***\n"
+" 1: status 2: update 3: revert 4: add untracked\n"
+" 5: patch 6: diff 7: quit 8: help\n"
+" What now> 1\n"
#. type: Plain text
#: en/git-add.txt:254
@@ -6760,7 +6776,21 @@ msgid ""
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
-msgstr "y - 畇棘閨逵勻龜�� ��棘� ��逵均劇筠戟� 勻 龜戟畇筠克�\nn - 戟筠 畇棘閨逵勻剋��� ��棘� ��逵均劇筠戟� 勻 龜戟畇筠克�\nq - 勻�橘�龜; 戟筠 畇棘閨逵勻剋��� 勻 龜戟畇筠克� 戟龜 ��棘�, 戟龜 棘��逵勻�龜筠�� ��逵均劇筠戟��\na - 畇棘閨逵勻龜�� ��棘� 龜 勻�筠 棘��逵勻�龜筠�� ��逵均劇筠戟�� �逵橘剋逵\nd - 畇棘閨逵勻剋��� 戟龜 ��棘�, 戟龜 勻�筠 棘��逵勻�龜筠�� ��逵均劇筠戟�� �逵橘剋逵\ng - 勻�閨�逵�� ��逵均劇筠戟� 畇剋� 極筠�筠�棘畇逵\n/ - 極棘龜�克 ��逵均劇筠戟�逵 � 極棘劇棘��� �筠均�剋��戟�� 勻��逵菌筠戟龜橘\nj - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 �筠�筠戟龜�, �劇棘��筠�� �剋筠畇���龜橘 戟筠�筠�筠戟戟�橘\nJ - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� �剋筠畇���龜橘 ��逵均劇筠戟�\nk - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� 極�筠畇�畇��龜橘 戟筠�筠�筠戟戟�橘\nK - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� 極�筠畇�畇��龜橘 ��逵均劇筠戟�\ns - �逵鈞畇筠剋龜�� �筠克��龜橘 ��逵均劇筠戟� 戟逵 劇筠剋克龜筠 ��逵均劇筠戟��\ne - �筠畇逵克�龜�棘勻逵�� �筠克��龜橘 ��逵均劇筠戟� 勻���戟��\n? - 極棘克逵鈞逵�� �極�逵勻克�\n"
+msgstr ""
+"y - 畇棘閨逵勻龜�� ��棘� ��逵均劇筠戟� 勻 龜戟畇筠克�\n"
+"n - 戟筠 畇棘閨逵勻剋��� ��棘� ��逵均劇筠戟� 勻 龜戟畇筠克�\n"
+"q - 勻�橘�龜; 戟筠 畇棘閨逵勻剋��� 勻 龜戟畇筠克� 戟龜 ��棘�, 戟龜 棘��逵勻�龜筠�� ��逵均劇筠戟��\n"
+"a - 畇棘閨逵勻龜�� ��棘� 龜 勻�筠 棘��逵勻�龜筠�� ��逵均劇筠戟�� �逵橘剋逵\n"
+"d - 畇棘閨逵勻剋��� 戟龜 ��棘�, 戟龜 勻�筠 棘��逵勻�龜筠�� ��逵均劇筠戟�� �逵橘剋逵\n"
+"g - 勻�閨�逵�� ��逵均劇筠戟� 畇剋� 極筠�筠�棘畇逵\n"
+"/ - 極棘龜�克 ��逵均劇筠戟�逵 � 極棘劇棘��� �筠均�剋��戟�� 勻��逵菌筠戟龜橘\n"
+"j - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 �筠�筠戟龜�, �劇棘��筠�� �剋筠畇���龜橘 戟筠�筠�筠戟戟�橘\n"
+"J - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� �剋筠畇���龜橘 ��逵均劇筠戟�\n"
+"k - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� 極�筠畇�畇��龜橘 戟筠�筠�筠戟戟�橘\n"
+"K - 棘��逵勻龜�� ��逵均劇筠戟� 閨筠鈞 棘�勻筠�逵, �劇棘��筠�� 極�筠畇�畇��龜橘 ��逵均劇筠戟�\n"
+"s - �逵鈞畇筠剋龜�� �筠克��龜橘 ��逵均劇筠戟� 戟逵 劇筠剋克龜筠 ��逵均劇筠戟��\n"
+"e - �筠畇逵克�龜�棘勻逵�� �筠克��龜橘 ��逵均劇筠戟� 勻���戟��\n"
+"? - 極棘克逵鈞逵�� �極�逵勻克�\n"
#. type: Plain text
#: en/git-add.txt:346
@@ -6993,7 +7023,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7065,7 +7095,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7343,7 +7373,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8162,7 +8192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9669,19 +9699,19 @@ msgstr "鬼劇棘��龜 linkgit:git-add[1]."
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9702,181 +9732,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr "鬼棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 勻筠�棘克 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵."
@@ -9894,313 +9924,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr "�棘克逵鈞逵�� �極龜�棘克, 勻克剋��逵��龜橘 克逵克 棘��剋筠菌龜勻逵筠劇�筠 勻戟筠�戟龜筠 勻筠�克龜, �逵克 龜 剋棘克逵剋�戟�筠. 鬼棘勻劇筠��戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 � `--list` 極棘鈞勻棘剋�筠� 棘��龜剋���棘勻逵�� 龜� 極棘 �逵閨剋棘戟�(逵劇)."
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<戟棘勻逵� 勻筠�克逵>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10210,19 +10240,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10232,25 +10262,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10258,67 +10288,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], 均剋逵勻逵 link:user-manual.html#what-is-a-branch[Understanding history: What is a branch?쨩] (짬�棘戟龜劇逵戟龜筠 龜��棘�龜龜: 槻�棘 �逵克棘筠 勻筠�克逵?쨩) 勻 極棘剋�鈞棘勻逵�筠剋��克棘劇 ��克棘勻棘畇��勻筠 Git."
@@ -11412,7 +11442,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12273,13 +12303,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12297,13 +12327,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12453,7 +12483,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12495,13 +12525,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12555,7 +12585,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12567,13 +12597,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12633,7 +12663,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12882,7 +12912,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13411,7 +13441,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15921,7 +15951,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16329,7 +16359,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31465,7 +31495,7 @@ msgstr "鬼劇棘��龜 linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34255,19 +34285,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34285,391 +34315,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "--append"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr "edit"
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr "show"
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr "merge"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34679,7 +34709,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34687,13 +34717,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34702,175 +34732,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44589,19 +44619,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:280
msgid "git-restore - Restore working tree files"
msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠"
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44610,146 +44640,146 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "-s <tree>"
msgstr "�克逵鈞逵�筠剋�-畇筠�筠勻逵"
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--source"
msgid "--source=<tree>"
msgstr "--source"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44759,91 +44789,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48541,139 +48571,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<棘極�龜龜>] [<棘閨�筠克�>��]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59613,19 +59643,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60081,212 +60111,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61751,13 +61781,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62376,50 +62406,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid ""
#| "$ git fetch origin\n"
#| "$ git merge origin/next\n"
@@ -62432,7 +62462,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid ""
#| "$ git fetch origin\n"
#| "$ git merge origin/next\n"
@@ -62445,13 +62475,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62459,7 +62489,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64329,19 +64359,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.sk.po b/po/documentation.sk.po
index 6e4e57f..ba4182b 100644
--- a/po/documentation.sk.po
+++ b/po/documentation.sk.po
@@ -10,10 +10,10 @@ msgstr ""
"PO-Revision-Date: 2021-03-02 13:09+0100\n"
"Last-Translator: Jean-No챘l AVILA <jn.avila@free.fr>\n"
"Language-Team: Slovak\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. type: Labeled list
@@ -3551,55 +3551,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3616,43 +3616,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3664,25 +3664,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3695,7 +3695,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3710,7 +3710,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3725,37 +3725,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3765,85 +3765,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -5984,7 +5984,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -5996,7 +5996,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6957,7 +6957,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7029,7 +7029,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7307,7 +7307,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8125,7 +8125,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9630,19 +9630,19 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9663,181 +9663,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9855,313 +9855,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10171,19 +10171,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10193,25 +10193,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10219,67 +10219,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11368,7 +11368,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12229,13 +12229,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12253,13 +12253,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12409,7 +12409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12451,13 +12451,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12511,7 +12511,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12523,13 +12523,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12589,7 +12589,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12838,7 +12838,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13367,7 +13367,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15857,7 +15857,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16265,7 +16265,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31359,7 +31359,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34144,19 +34144,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34174,391 +34174,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34568,7 +34568,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34576,13 +34576,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34591,175 +34591,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44454,19 +44454,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44475,145 +44475,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44623,91 +44623,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48396,139 +48396,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59451,19 +59451,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59919,205 +59919,205 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, priority:240
+#, priority:100
msgid "bc4"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, priority:240
+#, priority:100
msgid "gvimdiff1"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, priority:100
msgid "nvimdiff"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, priority:240
+#, priority:100
msgid "nvimdiff1"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, priority:100
msgid "nvimdiff2"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, priority:100
msgid "nvimdiff3"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, priority:240
+#, priority:100
msgid "vimdiff1"
msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61564,13 +61564,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62189,49 +62189,49 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git rev-list foo bar ^baz\n"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62239,7 +62239,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62247,13 +62247,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62261,7 +62261,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64131,19 +64131,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index a96cf28..620833c 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -3558,55 +3558,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3623,43 +3623,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3671,25 +3671,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3702,7 +3702,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3717,7 +3717,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3732,37 +3732,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3772,85 +3772,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6006,7 +6006,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6018,7 +6018,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6984,7 +6984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7056,7 +7056,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7334,7 +7334,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8152,7 +8152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9658,19 +9658,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9691,181 +9691,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9883,313 +9883,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10199,19 +10199,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10221,25 +10221,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10247,67 +10247,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11396,7 +11396,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12257,13 +12257,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12281,13 +12281,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12437,7 +12437,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12479,13 +12479,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12539,7 +12539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12551,13 +12551,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12617,7 +12617,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12866,7 +12866,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13395,7 +13395,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15885,7 +15885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16293,7 +16293,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31390,7 +31390,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34176,19 +34176,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34206,391 +34206,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34600,7 +34600,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34608,13 +34608,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34623,175 +34623,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44491,19 +44491,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44512,145 +44512,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-s <tree>"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44660,91 +44660,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48434,139 +48434,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59490,19 +59490,19 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L<start>,<end>:<file>"
msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -59958,209 +59958,209 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, priority:240
+#, priority:100
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "nvimdiff"
msgid "nvimdiff1"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, priority:240
+#, priority:100
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, priority:240
+#, priority:100
msgid "nvimdiff3"
msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61615,13 +61615,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62240,50 +62240,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62291,7 +62291,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62299,13 +62299,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62313,7 +62313,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64183,19 +64183,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 9b845e9..f1feffa 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,7 +3,19 @@
# This file is distributed under the same license as the Git package.
# Matthias A횩hauer <mha1993@live.de>, 2019.
msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-04-06 18:01+0000\nLast-Translator: Patrick R GUERRERO <jcs.pattystackzz@gmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.6-dev\n"
+msgstr ""
+"Project-Id-Version: git documentation\n"
+"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
+"POT-Creation-Date: 2021-02-27 18:16+0100\n"
+"PO-Revision-Date: 2021-04-06 18:01+0000\n"
+"Last-Translator: Patrick R GUERRERO <jcs.pattystackzz@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_HANS-CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.6-dev\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:738 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
@@ -69,7 +81,7 @@ msgstr "'<start>' �� '<end>' ��룾�됬쉪 `-L <start>` �� `-L <start>,` �껃쎍
#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt: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
#, ignore-same, no-wrap, priority:300
msgid "-l"
-msgstr "\"repo\"{Index.yml}"
+msgstr "-l"
#. type: Plain text
#: en/blame-options.txt:25
@@ -1637,8 +1649,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
-# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#. type: Plain text
+# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#: en/cmds-plumbinginterrogators.txt:39
#, priority:100
msgid "Find symbolic names for given revs."
@@ -3568,55 +3580,55 @@ msgstr "�③뇥�썲릫�꾣깄�듕툔竊뚦츑�닺러孃꾢뎺鸚싧눣�� `NUL` 訝뷰틙溫⑵�
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3633,43 +3645,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3681,25 +3693,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3712,7 +3724,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3727,7 +3739,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3742,37 +3754,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3782,85 +3794,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, fuzzy, priority:260
+#, fuzzy, priority:280
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 "`mode<mode>竊�<mode>..<mode>` 烏뚥퍎�� <mode> 訝�눛弱묉쐣訝�訝や툗�뜸퐰�꾡툖�뚧뿶�띴폏�븀렟�귛똿�ユ쐣�녔�役뗥댆�꾢냵若밭㎉�①쉪岳→겘 (�띶뫝�띶뭽鸚띶댍汝�役�) �꾣돥掠뺞젃鸚닺�溫▽맏鵝욜뵪訝ㅴ릉 <tree-ish> �� diff竊뚥툖�썹뵪雅롧퍍�덄쉪 diff �쇔폀��"
#. type: Plain text
#: en/diff-generate-patch.txt:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr "Index.pg"
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, fuzzy, priority:260
+#, fuzzy, priority:280
msgid "b/file"
msgstr "Files.index,core,source"
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -5079,7 +5091,12 @@ msgid ""
"\t0.5, and is thus the same as `-M50%`. Similarly, `-M05` is\n"
"\tthe same as `-M5%`. To limit detection to exact renames, use\n"
"\t`-M100%`. The default similarity index is 50%.\n"
-msgstr "\t倻귝옖�뉐츣雅� `n`竊뚦닕�뜸맏�멧세佯�뙁�곈삁�쇽펷�녕쎑驪붶틢�뉏뻑鸚㎩컦�꾢쥭/�좈뇧竊됥��\n\t堊뗥쫩竊�`-M90竊�` 烏①ㅊ倻귝옖�뉏뻑90竊끺빳訝딁쉪�끻�亦→쐣�닸뵻竊뚦닕 Git 佯붷컛�좈솮/曆삣뒥野배쭍訝븅뇥�썲릫��\n\t倻귝옖亦→쐣 `竊�` 寧�뤇竊뚦닕瑥ζ빊耶쀥틪鵝쒍맏弱뤸빊瑥삣룚竊뚦뭉�ⓨ끀�띺씊�졽툓弱뤸빊�밤��\n \t�� `-M5` �섆맏 0.5竊뚦썱閭ㅴ툗 `-M50竊�` �멨릪�� �뚧졆竊�`-M05` 訝� `-M5竊�` �멨릪��\n \t誤곩컛汝�役뗩솏�뜸맏暎양‘�꾦뇥�썲릫竊뚩�鵝욜뵪 `-M100竊�`�� 容섋��멧세佯�뙁�겻맏50竊끹��\n"
+msgstr ""
+"\t倻귝옖�뉐츣雅� `n`竊뚦닕�뜸맏�멧세佯�뙁�곈삁�쇽펷�녕쎑驪붶틢�뉏뻑鸚㎩컦�꾢쥭/�좈뇧竊됥��\n"
+"\t堊뗥쫩竊�`-M90竊�` 烏①ㅊ倻귝옖�뉏뻑90竊끺빳訝딁쉪�끻�亦→쐣�닸뵻竊뚦닕 Git 佯붷컛�좈솮/曆삣뒥野배쭍訝븅뇥�썲릫��\n"
+"\t倻귝옖亦→쐣 `竊�` 寧�뤇竊뚦닕瑥ζ빊耶쀥틪鵝쒍맏弱뤸빊瑥삣룚竊뚦뭉�ⓨ끀�띺씊�졽툓弱뤸빊�밤��\n"
+" \t�� `-M5` �섆맏 0.5竊뚦썱閭ㅴ툗 `-M50竊�` �멨릪�� �뚧졆竊�`-M05` 訝� `-M5竊�` �멨릪��\n"
+" \t誤곩컛汝�役뗩솏�뜸맏暎양‘�꾦뇥�썲릫竊뚩�鵝욜뵪 `-M100竊�`�� 容섋��멧세佯�뙁�겻맏50竊끹��\n"
#. type: Labeled list
#: en/diff-options.txt:553
@@ -5220,7 +5237,10 @@ msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
-msgstr "+ return frotz(nitfol, two->ptr, 1, 0);\n...\n- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
+msgstr ""
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
+"...\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
#. type: Plain text
#: en/diff-options.txt:639
@@ -6030,7 +6050,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6042,7 +6062,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6878,8 +6898,8 @@ msgstr "�좈솮�꾢냵若�"
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr "�좈솮�꾢냵若밥빳��-�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�싪퓝弱녳��-�앲쉬�㏘맏�� �앾펷令뷸졏竊됪씎�꿩�弱녶끀�좈솮��"
-# 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻
#. type: Labeled list
+# 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻
#: en/git-add.txt:379
#, fuzzy, no-wrap, priority:300
msgid "modified content"
@@ -7033,7 +7053,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7105,7 +7125,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7383,7 +7403,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8202,7 +8222,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9745,19 +9765,19 @@ msgstr "linkgit:git-add[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9778,181 +9798,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "-M"
msgstr "-M"
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "-C"
msgstr "-C"
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9970,313 +9990,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr "--set-upstream-to=<upstream>"
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr "--contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr "--no-contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr "--merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr "--no-merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "<oldbranch>"
msgstr "<oldbranch>"
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "<newbranch>"
msgstr "<newbranch>"
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--points-at <object>"
msgstr "--points-at <object>"
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "--format <format>"
msgstr "--format <format>"
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10286,19 +10306,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10312,25 +10332,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10340,67 +10360,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:260
msgid "NOTES"
msgstr "力③뇢"
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11496,7 +11516,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12376,13 +12396,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12400,13 +12420,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12556,7 +12576,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12598,13 +12618,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr "--conflict=<style>"
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12658,7 +12678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12670,13 +12690,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12736,7 +12756,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12996,7 +13016,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13540,7 +13560,7 @@ 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:111
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr "--strategy=<strategy>"
@@ -15092,7 +15112,14 @@ msgid ""
"\t [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
"\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [-S[<keyid>]] [--] [<pathspec>...]\n"
-msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<與▼폀>] [--amend]\n\t [--dry-run] [(-c | -C | --fixup | --squash) <�먧벡>]\n\t [-F <�뉏뻑> | -m <易덃겘>] [--reset-author] [--allow-empty]\n\t [--allow-empty-message] [--no-verify] [-e] [--author=<鵝쒑��>]\n\t [--date=<�ζ쐿>] [--cleanup=<與▼폀>] [--[no-]status]\n\t [-i | -o] [--pathspec-from-file=<�뉏뻑> [--pathspec-file-nul]]\n\t [-S[<keyid>]] [--] [<瓮�푶>...]\n"
+msgstr ""
+"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<與▼폀>] [--amend]\n"
+"\t [--dry-run] [(-c | -C | --fixup | --squash) <�먧벡>]\n"
+"\t [-F <�뉏뻑> | -m <易덃겘>] [--reset-author] [--allow-empty]\n"
+"\t [--allow-empty-message] [--no-verify] [-e] [--author=<鵝쒑��>]\n"
+"\t [--date=<�ζ쐿>] [--cleanup=<與▼폀>] [--[no-]status]\n"
+"\t [-i | -o] [--pathspec-from-file=<�뉏뻑> [--pathspec-file-nul]]\n"
+"\t [-S[<keyid>]] [--] [<瓮�푶>...]\n"
#. type: Plain text
#: en/git-commit.txt:27
@@ -16125,7 +16152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16533,7 +16560,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr "��쥊"
@@ -31829,7 +31856,7 @@ msgstr ""
#: en/git-log.txt:215
#, ignore-same, no-wrap, priority:260
msgid "log.showRoot"
-msgstr "Git.showRoot"
+msgstr "log.showRoot"
#. type: Plain text
#: en/git-log.txt:220
@@ -31863,7 +31890,7 @@ msgstr "See linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34697,19 +34724,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, fuzzy, priority:100
+#, fuzzy, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr "git-notes - Add or inspect object notes"
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34727,391 +34754,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "add"
msgstr "曆삣뒥"
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "copy"
msgstr "鸚띶댍"
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr "<from-object> SP <to-object> [ SP <rest> ] LF\n"
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "append"
msgstr "瓦썲뒥"
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "edit"
msgstr "煐뽬풌"
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "show"
msgstr "�양ㅊ"
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, fuzzy, no-wrap, priority:220
+#, fuzzy, no-wrap, priority:280
msgid "merge"
msgstr "�덂뭉"
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr "--reuse-message=<object>"
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr "--reedit-message=<object>"
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "--ref <ref>"
msgstr "--ref <ref>"
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, fuzzy, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:280
msgid "-s <strategy>"
msgstr "-s <strategy>"
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -35125,7 +35152,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -35133,13 +35160,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -35151,175 +35178,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -45218,19 +45245,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -45239,145 +45266,145 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "-s <tree>"
msgstr "-s <tree>"
#. type: Labeled list
#: en/git-restore.txt:36
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--source=<tree>"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "-S"
msgstr "-S"
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -45391,91 +45418,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr "$ git restore --source=HEAD --staged --worktree hello.c\n"
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -49224,139 +49251,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, fuzzy, priority:260
+#, fuzzy, priority:240
msgid "git-show - Show various types of objects"
msgstr "git-show - Show various types of objects"
#. type: Plain text
#: en/git-show.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:260
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr "'git show' [<options>] [<object>...]\n"
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr "`git show v1.0.0`"
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr "`git show v1.0.0^{tree}`"
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr "`git show -s --format=%s v1.0.0^{commit}`"
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, fuzzy, no-wrap, priority:260
+#, fuzzy, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr "`git show master:Makefile master:t/Makefile`"
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -60406,20 +60433,20 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "-L <start>,<end>"
msgid "-L<start>,<end>:<file>"
msgstr "-L <start>,<end>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr "-L :<funcname>:<file>"
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60875,212 +60902,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "nvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "nvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "nvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -62548,13 +62575,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -63180,49 +63207,49 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, fuzzy, priority:100
+#, fuzzy, priority:260
msgid "Thus, the following command:"
msgstr "��똻餓δ툔�ζ쐿�쇔폀竊�"
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid "$ git rev-list foo bar ^baz\n"
msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n"
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -63232,7 +63259,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -63242,13 +63269,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -63256,7 +63283,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -65184,19 +65211,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index eb94592..c2b16b6 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -3556,55 +3556,55 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:15
-#, priority:260
+#, priority:280
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:18
-#, priority:260
+#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:20
-#, priority:260
+#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:22
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:26
-#, priority:260
+#, priority:280
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:30
-#, priority:260
+#, priority:280
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:32
-#, priority:260
+#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:44
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
@@ -3621,43 +3621,43 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:47
-#, priority:260
+#, priority:280
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:49
-#, priority:260
+#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:56
-#, priority:260
+#, priority:280
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:60
-#, priority:260
+#, priority:280
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:64
-#, priority:260
+#, priority:280
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:69
-#, priority:260
+#, priority:280
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:76
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
@@ -3669,25 +3669,25 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "Combined diff format"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:87
-#, priority:260
+#, priority:280
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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:89
-#, priority:260
+#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:98
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
@@ -3700,7 +3700,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:108
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
@@ -3715,7 +3715,7 @@ msgstr ""
#. type: delimited block -
#: en/diff-generate-patch.txt:118
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
@@ -3730,37 +3730,37 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:122
-#, priority:260
+#, priority:280
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:124
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:126
-#, priority:260
+#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:128
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid " diff --cc file\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:131
-#, priority:260
+#, priority:280
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:136
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
@@ -3770,85 +3770,85 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:142
-#, priority:260
+#, priority:280
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:144
-#, priority:260
+#, priority:280
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
-#, priority:260
+#, priority:280
msgid "a/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:147 en/diff-generate-patch.txt:160
-#, priority:260
+#, priority:280
msgid "b/file"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:151
-#, priority:260
+#, priority:280
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:155
-#, priority:260
+#, priority:280
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:164
-#, priority:260
+#, priority:280
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:170
-#, priority:260
+#, priority:280
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:172
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:175
-#, priority:260
+#, priority:280
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:184
-#, ignore-ellipsis, priority:260
+#, ignore-ellipsis, priority:280
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:190
-#, priority:260
+#, priority:280
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:196
-#, priority:260
+#, priority:280
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:202
-#, priority:260
+#, priority:280
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 ""
@@ -6005,7 +6005,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:198 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6017,7 +6017,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:203 en/git-branch.txt:227 en/git-push.txt:373
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -6983,7 +6983,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101 en/signoff-option.txt:4
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--signoff"
msgstr "--signoff"
@@ -7055,7 +7055,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 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:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"
@@ -7333,7 +7333,7 @@ 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
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--abort"
msgstr "--abort"
@@ -8152,7 +8152,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--list"
msgstr "--list"
@@ -9659,19 +9659,19 @@ msgstr "linkgit:git-check-mailmap[1]"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "git-branch(1)"
msgstr "git-branch(1)"
#. type: Plain text
#: en/git-branch.txt:7
-#, priority:240
+#, priority:260
msgid "git-branch - List, create, or delete branches"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
@@ -9692,181 +9692,181 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:36
-#, priority:240
+#, priority:260
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:41
-#, priority:240
+#, priority:260
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:45
-#, priority:240
+#, priority:260
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:54
-#, priority:240
+#, priority:260
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:65
-#, priority:240
+#, priority:260
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:73
-#, priority:240
+#, priority:260
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:79
-#, priority:240
+#, priority:260
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:83
-#, priority:240
+#, priority:260
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed, it will be copied to a new name, along with its config and reflog."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:87
-#, priority:240
+#, priority:260
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:93
-#, priority:240
+#, priority:260
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:97 en/git-checkout.txt:204 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:186
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--delete"
msgstr "--delete"
#. type: Plain text
#: en/git-branch.txt:102
-#, priority:240
+#, priority:260
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:105
-#, priority:240
+#, priority:260
msgid "Shortcut for `--delete --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:115
-#, priority:240
+#, priority:260
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:124
-#, priority:240
+#, priority:260
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:126
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--move"
msgstr "--move"
#. type: Plain text
#: en/git-branch.txt:128
-#, priority:240
+#, priority:260
msgid "Move/rename a branch and the corresponding reflog."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-fast-export.txt:53 en/git-p4.txt:317
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-M"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:131
-#, priority:240
+#, priority:260
msgid "Shortcut for `--move --force`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:133
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--copy"
msgstr "--copy"
#. type: Plain text
#: en/git-branch.txt:135
-#, priority:240
+#, priority:260
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:634
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-C"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:138
-#, priority:240
+#, priority:260
msgid "Shortcut for `--copy --force`."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:143
-#, priority:240
+#, priority:260
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:148
-#, priority:240
+#, priority:260
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--ignore-case"
msgstr "--ignore-case"
#. type: Plain text
#: en/git-branch.txt:152
-#, priority:240
+#, priority:260
msgid "Sorting and filtering branches are case insensitive."
msgstr ""
@@ -9884,313 +9884,313 @@ msgstr "--no-column"
#. type: Plain text
#: en/git-branch.txt:158
-#, priority:240
+#, priority:260
msgid "Display branch listing in columns. See configuration variable `column.branch` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:160
-#, priority:240
+#, priority:260
msgid "This option is only applicable in non-verbose mode."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:162 en/git-show-branch.txt:44
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--remotes"
msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, priority:240
+#, priority:260
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:170
-#, priority:240
+#, priority:260
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:176
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:177
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--show-current"
msgstr "--show-current"
#. type: Plain text
#: en/git-branch.txt:180
-#, priority:240
+#, priority:260
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "-vv"
msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, priority:240
+#, priority:260
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:196
-#, priority:240
+#, priority:260
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:203
-#, priority:240
+#, priority:260
msgid "In the verbose listing that show the commit object name, show the shortest prefix that is at least '<n>' hexdigits long that uniquely refers the object. The default value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:204
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-abbrev"
msgstr "--no-abbrev"
#. type: Plain text
#: en/git-branch.txt:206
-#, priority:240
+#, priority:260
msgid "Display the full sha1s in the output listing rather than abbreviating them."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:216
-#, priority:240
+#, priority:260
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:222
-#, priority:240
+#, priority:260
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--no-track"
msgstr "--no-track"
#. type: Plain text
#: en/git-branch.txt:226
-#, priority:240
+#, priority:260
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:230
-#, priority:240
+#, priority:260
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:231
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:232
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:236
-#, priority:240
+#, priority:260
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:237
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--unset-upstream"
msgstr "--unset-upstream"
#. type: Plain text
#: en/git-branch.txt:240
-#, priority:240
+#, priority:260
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:241
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:260
msgid "--edit-description"
msgstr "--edit-description"
#. type: Plain text
#: en/git-branch.txt:246
-#, priority:240
+#, priority:260
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:247 en/git-tag.txt:142
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:250
-#, priority:240
+#, priority:260
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:251 en/git-tag.txt:146
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:254
-#, priority:240
+#, priority:260
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:255 en/git-tag.txt:150
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:258
-#, priority:240
+#, priority:260
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:259 en/git-tag.txt:154
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:262
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<branchname>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:268
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<start-point>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:273
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:276
-#, priority:240
+#, priority:260
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:277
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "<newbranch>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:280
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--sort=<key>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:291
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:295
-#, priority:240
+#, priority:260
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:296
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "--format <format>"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:300
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:317
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
"$ cd my2.6\n"
@@ -10200,19 +10200,19 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:321
-#, priority:240
+#, priority:260
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
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:329
-#, ignore-ellipsis, no-wrap, priority:240
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
"$ cd my.git\n"
@@ -10222,25 +10222,25 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:334
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
msgstr ""
#. type: Labeled list
#: en/git-branch.txt:337
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
#: en/git-branch.txt:342
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
@@ -10248,67 +10248,67 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:346
-#, priority:240
+#, priority:260
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:347
-#, priority:240
+#, priority:260
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:349
-#, priority:240
+#, priority:260
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:115 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:552
-#, no-wrap, priority:240
+#, no-wrap, priority:260
msgid "NOTES"
msgstr ""
#. type: Plain text
#: en/git-branch.txt:356
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
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
-#, priority:240
+#, priority:260
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
msgstr ""
#. type: Plain text
#: en/git-branch.txt:382
-#, priority:240
+#, priority:260
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
msgstr ""
@@ -11402,7 +11402,7 @@ 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:51 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:46 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:153 en/rev-list-options.txt:217
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:280
msgid "--stdin"
msgstr "--stdin"
@@ -12263,13 +12263,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-progress"
msgstr "--no-progress"
#. type: Plain text
#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
-#, priority:240
+#, priority:280
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
msgstr ""
@@ -12287,13 +12287,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--theirs"
msgstr "--theirs"
@@ -12443,7 +12443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:237 en/git-restore.txt:104
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -12485,13 +12485,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
-#, priority:240
+#, priority:280
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 ""
@@ -12545,7 +12545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:157 en/git-restore.txt:111 en/git-switch.txt:184
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -12557,13 +12557,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:307 en/git-restore.txt:122
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--overlay"
msgstr "--overlay"
#. type: Labeled list
#: en/git-checkout.txt:308 en/git-restore.txt:123
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--no-overlay"
msgstr "--no-overlay"
@@ -12623,7 +12623,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
-#, ignore-ellipsis, priority:240
+#, ignore-ellipsis, priority:280
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 ""
@@ -12872,7 +12872,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:533 en/git-restore.txt:165
-#, priority:240
+#, priority:280
msgid "take a file out of another commit"
msgstr ""
@@ -13401,7 +13401,7 @@ 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:111
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "--strategy=<strategy>"
msgstr ""
@@ -15892,7 +15892,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:139 en/git-restore.txt:59
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--worktree"
msgstr "--worktree"
@@ -16300,7 +16300,7 @@ msgstr ""
#. type: Title -
#: en/git-config.txt:336 en/git-cvsserver.txt:310 en/git-daemon.txt:332 en/git-http-backend.txt:243 en/git-notes.txt:373
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "ENVIRONMENT"
msgstr ""
@@ -31416,7 +31416,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:228 en/git-notes.txt:333
-#, no-wrap, priority:260
+#, no-wrap, priority:280
msgid "notes.displayRef"
msgstr ""
@@ -34202,19 +34202,19 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-notes(1)"
msgstr "git-notes(1)"
#. type: Plain text
#: en/git-notes.txt:7
-#, priority:100
+#, priority:280
msgid "git-notes - Add or inspect object notes"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:23
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git notes' [list [<object>]]\n"
"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -34232,391 +34232,391 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:29
-#, priority:100
+#, priority:280
msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:34
-#, priority:100
+#, priority:280
msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:41
-#, priority:100
+#, priority:280
msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
-#, priority:100
+#, priority:280
msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:48
-#, priority:100
+#, priority:280
msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:51
-#, priority:100
+#, priority:280
msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
msgstr ""
#. type: Title -
#: en/git-notes.txt:54
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "SUBCOMMANDS"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:56 en/git-worktree.txt:95
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "list"
msgstr "list"
#. type: Plain text
#: en/git-notes.txt:61
-#, priority:100
+#, priority:280
msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\"). This is the default subcommand if no subcommand is given."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:62
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "add"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
-#, priority:100
+#, priority:280
msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes). However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:70
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "copy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:76
-#, priority:100
+#, priority:280
msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:78
-#, priority:100
+#, priority:280
msgid "In `--stdin` mode, take lines in the format"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:81
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "<from-object> SP <to-object> [ SP <rest> ] LF\n"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:86
-#, priority:100
+#, priority:280
msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:87
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "append"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
-#, priority:100
+#, priority:280
msgid "Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:91
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "edit"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:93
-#, priority:100
+#, priority:280
msgid "Edit the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:94
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "show"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:96
-#, priority:100
+#, priority:280
msgid "Show the notes for a given object (defaults to HEAD)."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:97 en/git-submodule.txt:160
-#, no-wrap, priority:220
+#, no-wrap, priority:280
msgid "merge"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:102
-#, priority:100
+#, priority:280
msgid "Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:111
-#, priority:100
+#, priority:280
msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:112 en/git-worktree.txt:124
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "remove"
msgstr "remove"
#. type: Plain text
#: en/git-notes.txt:117
-#, priority:100
+#, priority:280
msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:118 en/git-worktree.txt:120
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "prune"
msgstr "prune"
#. type: Plain text
#: en/git-notes.txt:120
-#, priority:100
+#, priority:280
msgid "Remove all notes for non-existing/unreachable objects."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:121
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "get-ref"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:124
-#, priority:100
+#, priority:280
msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:131
-#, priority:100
+#, priority:280
msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
-#, priority:100
+#, priority:280
msgid "Use the given note message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
-#, priority:100
+#, priority:280
msgid "Take the note message from the given file. Use '-' to read the note message from the standard input. Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:147
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-C <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:148
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reuse-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
-#, priority:100
+#, priority:280
msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:153
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-c <object>"
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:154
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--reedit-message=<object>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
-#, priority:100
+#, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:161
-#, priority:100
+#, priority:280
msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "--ref <ref>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:168
-#, priority:100
+#, priority:280
msgid "Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration. The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:172
-#, priority:100
+#, priority:280
msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
-#, priority:100
+#, priority:280
msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:182
-#, priority:100
+#, priority:280
msgid "Do not remove anything; just report the object names whose notes would be removed."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
-#, no-wrap, priority:240
+#, no-wrap, priority:280
msgid "-s <strategy>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:191
-#, priority:100
+#, priority:280
msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:280
msgid "--commit"
msgstr "--commit"
#. type: Plain text
#: en/git-notes.txt:200
-#, priority:100
+#, priority:280
msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:205
-#, priority:100
+#, priority:280
msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:209
-#, priority:100
+#, priority:280
msgid "When merging notes, operate quietly."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:215
-#, priority:100
+#, priority:280
msgid "When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:280
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
#: en/git-notes.txt:236
-#, priority:100
+#, priority:280
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:240
-#, priority:100
+#, priority:280
msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
msgstr ""
#. type: Title -
#: en/git-notes.txt:243
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "NOTES MERGE STRATEGIES"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
-#, priority:100
+#, priority:280
msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:255
-#, priority:100
+#, priority:280
msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:258
-#, priority:100
+#, priority:280
msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:262
-#, priority:100
+#, priority:280
msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:265
-#, priority:100
+#, priority:280
msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:275
-#, priority:100
+#, priority:280
msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
-#, priority:100
+#, priority:280
msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:288
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2\n"
"$ git show -s 72a144e\n"
@@ -34626,7 +34626,7 @@ msgstr ""
#. type: delimited block -
#: en/git-notes.txt:291
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"Notes:\n"
" Tested-by: Johannes Sixt <j6t@kdbg.org>\n"
@@ -34634,13 +34634,13 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:296
-#, priority:100
+#, priority:280
msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using 'git hash-object':"
msgstr ""
#. type: delimited block -
#: en/git-notes.txt:301
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ cc *.c\n"
"$ blob=$(git hash-object -w a.out)\n"
@@ -34649,175 +34649,175 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:308
-#, priority:100
+#, priority:280
msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.) Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "core.notesRef"
msgstr "core.notesRef"
#. type: Plain text
#: en/git-notes.txt:318
-#, priority:100
+#, priority:280
msgid "Notes ref to read and manipulate instead of `refs/notes/commits`. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:319
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:324
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose by default when resolving notes conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:326
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by passing the `--strategy` option."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:327
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.<name>.mergeStrategy"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
-#, priority:100
+#, priority:280
msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\". See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:341
-#, priority:100
+#, priority:280
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:342
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewrite.<command>"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:347
-#, priority:100
+#, priority:280
msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit. Defaults to `true`. See also \"`notes.rewriteRef`\" below."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:350
-#, priority:100
+#, priority:280
msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:351
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteMode"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
-#, priority:100
+#, priority:280
msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:360
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "notes.rewriteRef"
msgstr ""
#. type: Plain text
#: en/git-notes.txt:365
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:368
-#, priority:100
+#, priority:280
msgid "Does not have a default value; you must configure this variable to enable note rewriting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:370
-#, priority:100
+#, priority:280
msgid "Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
#. type: Plain text
#: en/git-notes.txt:378
-#, priority:100
+#, priority:280
msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`. This overrides the `core.notesRef` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
#. type: Plain text
#: en/git-notes.txt:385
-#, priority:100
+#, priority:280
msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:388
-#, priority:100
+#, priority:280
msgid "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: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
-#, priority:100
+#, priority:280
msgid "When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
#. type: Plain text
#: en/git-notes.txt:399
-#, priority:100
+#, priority:280
msgid "When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:402
-#, priority:100
+#, priority:280
msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
msgstr ""
@@ -44525,19 +44525,19 @@ msgstr ""
#. type: Title =
#: en/git-restore.txt:2
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "git-restore(1)"
msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, priority:100
+#, priority:280
msgid "git-restore - Restore working tree files"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:14
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...\n"
"'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
@@ -44546,147 +44546,147 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:20
-#, priority:100
+#, priority:280
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:24
-#, priority:100
+#, priority:280
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:27
-#, priority:100
+#, priority:280
msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:32 en/git-switch.txt:33
-#, priority:100
+#, priority:280
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:35
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "subtree"
msgid "-s <tree>"
msgstr "subtree"
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:280
#| msgid "--source"
msgid "--source=<tree>"
msgstr "--source"
#. type: Plain text
#: en/git-restore.txt:40
-#, priority:100
+#, priority:280
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:43
-#, priority:100
+#, priority:280
msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:54
-#, priority:100
+#, priority:280
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:57
-#, priority:100
+#, priority:280
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:60
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "-S"
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:61
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--staged"
msgstr "--staged"
#. type: Plain text
#: en/git-restore.txt:65
-#, priority:100
+#, priority:280
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:69
-#, priority:100
+#, priority:280
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:81
-#, priority:100
+#, priority:280
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:85
-#, priority:100
+#, priority:280
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:90
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
#. type: Labeled list
#: en/git-restore.txt:98
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--ignore-unmerged"
msgstr "--ignore-unmerged"
#. type: Plain text
#: en/git-restore.txt:103
-#, priority:100
+#, priority:280
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:110
-#, priority:100
+#, priority:280
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:121
-#, priority:100
+#, priority:280
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:128
-#, priority:100
+#, priority:280
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:156
-#, priority:100
+#, priority:280
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:162
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
@@ -44696,91 +44696,91 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:166
-#, priority:100
+#, priority:280
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:169
-#, priority:100
+#, priority:280
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:172
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:178
-#, priority:100
+#, priority:280
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
#. type: Plain text
#: en/git-restore.txt:180
-#, priority:100
+#, priority:280
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:183
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:187
-#, priority:100
+#, priority:280
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:190
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:194
-#, priority:100
+#, priority:280
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:197
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:201
-#, priority:100
+#, priority:280
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:204
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:207
-#, priority:100
+#, priority:280
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
#: en/git-restore.txt:210
-#, no-wrap, priority:100
+#, no-wrap, priority:280
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
#: en/git-restore.txt:216
-#, ignore-same, priority:100
+#, ignore-same, priority:280
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr "linkgit:git-checkout[1], linkgit:git-reset[1]"
@@ -48472,139 +48472,139 @@ msgstr "linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-updat
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap, priority:260
+#, ignore-same, no-wrap, priority:240
msgid "git-show(1)"
msgstr "git-show(1)"
#. type: Plain text
#: en/git-show.txt:7
-#, priority:260
+#, priority:240
msgid "git-show - Show various types of objects"
msgstr ""
#. type: Plain text
#: en/git-show.txt:13
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git show' [<options>] [<object>...]\n"
msgstr ""
#. type: Plain text
#: en/git-show.txt:17
-#, priority:260
+#, priority:240
msgid "Shows one or more objects (blobs, trees, tags and commits)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:21
-#, priority:260
+#, priority:240
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
#. type: Plain text
#: en/git-show.txt:23
-#, priority:260
+#, priority:240
msgid "For tags, it shows the tag message and the referenced objects."
msgstr ""
#. type: Plain text
#: en/git-show.txt:26
-#, priority:260
+#, priority:240
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
#: en/git-show.txt:28
-#, priority:260
+#, priority:240
msgid "For plain blobs, it shows the plain contents."
msgstr ""
#. type: Plain text
#: en/git-show.txt:31
-#, priority:260
+#, priority:240
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
#. type: Plain text
#: en/git-show.txt:33
-#, priority:260
+#, priority:240
msgid "This manual page describes only the most frequently used options."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:37
-#, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:240
msgid "<object>..."
msgstr ""
#. type: Plain text
#: en/git-show.txt:41
-#, priority:260
+#, priority:240
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: Plain text
#: en/git-show.txt:52
-#, priority:260
+#, priority:240
msgid "The options below can be used to change the way `git show` generates diff output."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:63
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:66
-#, priority:260
+#, priority:240
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:67
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show v1.0.0^{tree}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:69
-#, priority:260
+#, priority:240
msgid "Shows the tree pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:70
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show -s --format=%s v1.0.0^{commit}`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:73
-#, priority:260
+#, priority:240
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:74
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show next~10:Documentation/README`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:78
-#, priority:260
+#, priority:240
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
#. type: Labeled list
#: en/git-show.txt:79
-#, no-wrap, priority:260
+#, no-wrap, priority:240
msgid "`git show master:Makefile master:t/Makefile`"
msgstr ""
#. type: Plain text
#: en/git-show.txt:82
-#, priority:260
+#, priority:240
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
@@ -59542,20 +59542,20 @@ msgstr ""
#. type: Labeled list
#: en/line-range-options.txt:1
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "-L <start>,<end>"
msgid "-L<start>,<end>:<file>"
msgstr "-L <壅룬퍧>,<永귡퍧>"
#. type: Labeled list
#: en/line-range-options.txt:2
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "-L:<funcname>:<file>"
msgstr ""
#. type: Plain text
#: en/line-range-options.txt:14
-#, priority:100
+#, priority:260
msgid "Trace the evolution of the line range given by '<start>,<end>', or by 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 ""
@@ -60011,212 +60011,212 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "bc"
msgid "bc4"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "gvimdiff"
msgid "gvimdiff1"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "nvimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff2"
msgid "nvimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff3"
msgid "nvimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:26
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "smerge"
msgstr "smerge"
#. type: Plain text
#: en/mergetools-merge.txt:27
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:28
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:29
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:30
-#, fuzzy, priority:240
+#, fuzzy, priority:100
#| msgid "vimdiff"
msgid "vimdiff1"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:31
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:32
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:33
-#, ignore-same, priority:240
+#, ignore-same, priority:100
msgid "xxdiff"
msgstr "xxdiff"
#. type: Plain text
#: en/object-format-disclaimer.txt:6
-#, priority:100
+#, priority:300
msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage. A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories. It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways. Only use `--object-format=sha256` for testing purposes."
msgstr ""
@@ -61688,13 +61688,13 @@ msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:4
-#, priority:100
+#, priority:260
msgid "When combining multiple `--contains` and `--no-contains` filters, only references that contain at least one of the `--contains` commits and contain none of the `--no-contains` commits are shown."
msgstr ""
#. type: Plain text
#: en/ref-reachability-filters.txt:7
-#, priority:100
+#, priority:260
msgid "When combining multiple `--merged` and `--no-merged` filters, only references that are reachable from at least one of the `--merged` commits and from none of the `--no-merged` commits are shown."
msgstr ""
@@ -62313,50 +62313,50 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:5
-#, priority:100
+#, priority:260
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/rev-list-description.txt:12
-#, priority:100
+#, priority:260
msgid "You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, 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/rev-list-description.txt:14
-#, priority:100
+#, priority:260
msgid "Thus, the following command:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:18
-#, fuzzy, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:260
#| msgid "git-rev-list(1)"
msgid "$ git rev-list foo bar ^baz\n"
msgstr "git-rev-list(1)"
#. type: delimited block -
#: en/rev-list-description.txt:23
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid "$ git log foo bar ^baz\n"
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:28
-#, priority:100
+#, priority:260
msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:32
-#, priority:100
+#, priority:260
msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"^'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:37
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git rev-list origin..HEAD\n"
"$ git rev-list HEAD ^origin\n"
@@ -62364,7 +62364,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:43
-#, no-wrap, priority:100
+#, no-wrap, priority:260
msgid ""
"$ git log origin..HEAD\n"
"$ git log HEAD ^origin\n"
@@ -62372,13 +62372,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-description.txt:49
-#, ignore-ellipsis, priority:100
+#, ignore-ellipsis, priority:260
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/rev-list-description.txt:54
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git rev-list A B --not $(git merge-base --all A B)\n"
"$ git rev-list A...B\n"
@@ -62386,7 +62386,7 @@ msgstr ""
#. type: delimited block -
#: en/rev-list-description.txt:60
-#, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"$ git log A B --not $(git merge-base --all A B)\n"
"$ git log A...B\n"
@@ -64256,19 +64256,19 @@ msgstr ""
#. type: Labeled list
#: en/signoff-option.txt:5
-#, ignore-same, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:280
msgid "--no-signoff"
msgstr "--no-signoff"
#. type: Plain text
#: en/signoff-option.txt:16
-#, priority:100
+#, priority:280
msgid "Add a `Signed-off-by` trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you're committing. For example, it may certify that the committer has the rights to submit the work under the project's license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git projects.) Consult the documentation or leadership of the project to which you're contributing to understand how the signoffs are used in that project."
msgstr ""
#. type: Plain text
#: en/signoff-option.txt:18
-#, priority:100
+#, priority:280
msgid "The --no-signoff option can be used to countermand an earlier --signoff option on the command line."
msgstr ""
diff --git a/scripts/set-priorities b/scripts/set-priorities
index 197b144..82dec83 100755
--- a/scripts/set-priorities
+++ b/scripts/set-priorities
@@ -2,66 +2,71 @@
import polib
import sys
+import re
+from os.path import join, dirname
SECTIONS = {300: ["en/git-init.txt",
"en/git-clone.txt",
- "en/urls.txt",
"en/git-add.txt"],
280: ["en/git-status.txt",
"en/git-diff.txt",
"en/diff-options.txt",
"en/diff-format.txt",
"en/git-commit.txt",
- "en/date-formats.txt",
- "en/i18n.txt",
+ "en/git-notes.txt",
+ "en/git-restore.txt",
"en/git-reset.txt",
"en/git-rm.txt",
"en/git-mv.txt"],
- 260: ["en/git-show.txt",
- "en/pretty-options.txt",
- "en/pretty-formats.txt",
- "en/diff-generate-patch.txt",
+ 260: ["en/git-branch.txt",
"en/git-log.txt",
- "en/line-range-format.txt",
- "en/rev-list-options.txt",
"en/git-shortlog.txt",
- "en/mailmap.txt",
"en/git-describe.txt"],
- 240: ["en/git-branch.txt",
+ 240: ["en/git-show.txt",
"en/git-checkout.txt",
"en/git-merge.txt",
- "en/merge-options.txt",
- "en/merge-strategies.txt",
- "en/config/merge.txt",
- "en/config/fmt-merge-msg.txt",
- "en/mergetools-merge.txt",
"en/git-mergetool.txt",
"en/git-stash.txt",
"en/git-tag.txt",
"en/git-worktree.txt"],
220: ["en/git-fetch.txt",
- "en/fetch-options.txt",
- "en/pull-fetch-param.txt",
- "en/urls-remotes.txt",
- "en/transfer-data-leaks.txt",
"en/git-pull.txt",
"en/git-push.txt",
"en/git-remote.txt",
"en/git-submodule.txt"]
}
-def main (f):
- po = polib.pofile(f, wrapwidth=0)
+INCLUDE_REGEX = re.compile('''include::(.*)\\[\\]\n''')
+
+def process_file(filename, priority, priorities):
+ basedirname = dirname(filename)
+ try:
+ with open(filename, 'r') as f:
+ for line in f.readlines():
+ match = INCLUDE_REGEX.fullmatch(line)
+ if match:
+ filename = join(basedirname, match.group(1))
+ priorities[filename] = max(priority, priorities.get(filename, 100))
+ process_file(filename, priority, priorities)
+ except Exception:
+ print("could not find " + filename)
+
+def main(f_list):
priorities = dict((source, section) for section in SECTIONS for source in SECTIONS[section])
- for entry in po:
- if not entry.obsolete:
- flags = [f for f in entry.flags if not (f.startswith("priority") or f.isdigit()) ]
- p = max(priorities.get(filename) or 100 for (filename,_) in entry.occurrences)
- flags.append("priority:{}".format(p))
- entry.flags = flags
- po.save(f)
+ items = list(priorities.items())
+ for source, priority in items:
+ process_file(source, priority, priorities)
+ for source in f_list:
+ po = polib.pofile(source, wrapwidth=0)
+ for entry in po:
+ if not entry.obsolete:
+ flags = [f for f in entry.flags if not (f.startswith("priority") or f.isdigit())]
+ p = max(priorities.get(filename, 100) for (filename, _) in entry.occurrences)
+ flags.append("priority:{}".format(p))
+ entry.flags = flags
+ po.save(source)
if __name__ == '__main__':
- if len(sys.argv)>1:
- main(sys.argv[1])
+ if len(sys.argv) > 1:
+ main(sys.argv[1:])
--
GitLab